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

-regenerate DBs

Browse Source
This commit is contained in:
Christian Grothoff 2022-08-14 19:10:19 +02:00
parent f5b99b5282
commit 1a3793cb1c
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
37 changed files with 2271 additions and 2442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
src/auditor/auditor-basedb-libeufin.sql
View File

File diff suppressed because one or more lines are too long

2
src/auditor/auditor-basedb.age
View File

@ -1 +1 @@
1660491075
1660496859

8
src/auditor/auditor-basedb.conf
View File

@ -3,7 +3,7 @@ KEYFILE = ${TALER_DATA_HOME}/merchant/default.priv
NAME = Merchant Inc.
[exchange-account-1]
PAYTO_URI = payto://iban/SANDBOXX/DE128580?receiver-name=Exchange+Company
PAYTO_URI = payto://iban/SANDBOXX/DE514871?receiver-name=Exchange+Company
enable_debit = yes
enable_credit = yes
@ -19,7 +19,7 @@ HONOR_default = YES
ACTIVE_default = YES
[merchant-exchange-default]
MASTER_KEY = EHBD7SW56Y5KD1VT7YVSWJ3MMB7ZNASXE4NMEGE82D8RZ413GWR0
MASTER_KEY = 8PZ0QC89YREAFB9TAM2SK8NRA9G2RMXA4Q814N0RX3Y8DQ64H0G0
EXCHANGE_BASE_URL = http://localhost:8081/
CURRENCY = TESTKUDOS
@ -155,7 +155,7 @@ UNIXPATH = ${TALER_RUNTIME_DIR}/merchant.http
CONFIG = postgres:///auditor-basedb
[exchange]
MASTER_PUBLIC_KEY = EHBD7SW56Y5KD1VT7YVSWJ3MMB7ZNASXE4NMEGE82D8RZ413GWR0
MASTER_PUBLIC_KEY = 8PZ0QC89YREAFB9TAM2SK8NRA9G2RMXA4Q814N0RX3Y8DQ64H0G0
SIGNKEY_DURATION = 4 weeks
LOOKAHEAD_SIGN = 32 weeks 1 day
SIGNKEY_LEGAL_DURATION = 4 weeks
@ -177,7 +177,7 @@ CONFIG = postgres:///auditor-basedb
[auditor]
BASE_URL = http://localhost:8083/
TINY_AMOUNT = TESTKUDOS:0.01
PUBLIC_KEY = RPBANQQH936J5S6Q61A58WA9R92WKXPBZNYWFZ5YXNZB0NFV78NG
PUBLIC_KEY = 41SE6QAX583WXH9BD77YMXJ46DDZRK4Z3FA2H2Y5CH8XD2H547AG
[PATHS]
TALER_CACHE_HOME = $TALER_HOME/.cache/taler/

2
src/auditor/auditor-basedb.mpub
View File

@ -1 +1 @@
EHBD7SW56Y5KD1VT7YVSWJ3MMB7ZNASXE4NMEGE82D8RZ413GWR0
8PZ0QC89YREAFB9TAM2SK8NRA9G2RMXA4Q814N0RX3Y8DQ64H0G0

2119
src/auditor/auditor-basedb.sql
View File

File diff suppressed because it is too large Load Diff

192
src/auditor/revoke-basedb-libeufin.sql
View File

File diff suppressed because one or more lines are too long

2
src/auditor/revoke-basedb.age
View File

@ -1 +1 @@
1660491749
1660496983

2
src/auditor/revoke-basedb.mpub
View File

@ -1 +1 @@
78C7KGQ7780CDXG1MKTFVHHWQ32DNJ7TDFVJX4FB8ZVB6ZXK1Y6G
VEWAE4STYQN97W0VGHXC4SEXBF13QB7R8YRVSQM305KHTF8Y1VSG

2151
src/auditor/revoke-basedb.sql
View File

File diff suppressed because it is too large Load Diff

2
src/exchange/taler-exchange-httpd_batch-withdraw.c
View File

@ -209,7 +209,7 @@ batch_withdraw_transaction (void *cls,
TEH_plugin->cls,
kyc_required,
&wc->h_payto,
&wc->kyc.payment_target_uuid);
&wc->kyc.legitimization_uuid);
}
wc->kyc.ok = true;
qs = TEH_plugin->do_batch_withdraw (TEH_plugin->cls,

4
src/exchange/taler-exchange-httpd_deposits_get.c
View File

@ -252,11 +252,11 @@ handle_track_transaction_request (
connection,
MHD_HTTP_ACCEPTED,
GNUNET_JSON_pack_allow_null (
(0 == ctx->kyc.payment_target_uuid)
(0 == ctx->kyc.legitimization_uuid)
? GNUNET_JSON_pack_string ("legitimization_uuid",
NULL)
: GNUNET_JSON_pack_uint64 ("legitimization_uuid",
ctx->kyc.payment_target_uuid)),
ctx->kyc.legitimization_uuid)),
GNUNET_JSON_pack_bool ("kyc_ok",
ctx->kyc.ok),
GNUNET_JSON_pack_timestamp ("execution_time",

2
src/exchange/taler-exchange-httpd_kyc-check.h
View File

@ -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

2
src/exchange/taler-exchange-httpd_kyc-proof.h
View File

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

2
src/exchange/taler-exchange-httpd_kyc-webhook.c
View File

@ -242,7 +242,7 @@ clean_kwh (struct TEH_RequestContext *rc)
* @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 payment_target_uuid
* @param args one argument with the legitimization_uuid
* @return MHD result code
*/
static MHD_RESULT

4
src/exchange/taler-exchange-httpd_kyc-webhook.h
View File

@ -37,7 +37,7 @@ TEH_kyc_webhook_cleanup (void);
* Handle a GET "/kyc-webhook" 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
@ -51,7 +51,7 @@ TEH_handler_kyc_webhook_get (
*
* @param rc request to handle
* @param root uploaded JSON body
* @param args one argument with the payment_target_uuid
* @param args one argument with the legitimization_uuid
* @return MHD result code
*/
MHD_RESULT

2
src/exchange/taler-exchange-httpd_purses_merge.c
View File

@ -292,7 +292,7 @@ merge_transaction (void *cls,
TEH_plugin->cls,
required,
&pcc->h_payto,
&pcc->kyc.payment_target_uuid);
&pcc->kyc.legitimization_uuid);
}
pcc->kyc.ok = true;
qs = TEH_plugin->do_purse_merge (

2
src/exchange/taler-exchange-httpd_reserves_purse.c
View File

@ -206,7 +206,7 @@ purse_transaction (void *cls,
TEH_plugin->cls,
required,
&rpc->h_payto,
&rpc->kyc.payment_target_uuid);
&rpc->kyc.legitimization_uuid);
}
rpc->kyc.ok = true;

2
src/exchange/taler-exchange-httpd_responses.c
View File

@ -985,7 +985,7 @@ TEH_RESPONSE_reply_kyc_required (struct MHD_Connection *connection,
connection,
MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS,
GNUNET_JSON_pack_uint64 ("legitimization_uuid",
kyc->payment_target_uuid));
kyc->legitimization_uuid));
}

2
src/exchange/taler-exchange-httpd_withdraw.c
View File

@ -182,7 +182,7 @@ withdraw_transaction (void *cls,
TEH_plugin->cls,
kyc_required,
&wc->h_payto,
&wc->kyc.payment_target_uuid);
&wc->kyc.legitimization_uuid);
}
wc->kyc.ok = true;
bp = &wc->blinded_planchet;

4
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -9605,7 +9605,7 @@ postgres_lookup_transfer_by_deposit (
GNUNET_PQ_result_spec_allow_null (
GNUNET_PQ_result_spec_uint64 ("legitimization_serial_id",
&kyc->payment_target_uuid),
&kyc->legitimization_uuid),
&no_kyc),
GNUNET_PQ_result_spec_allow_null (
GNUNET_PQ_result_spec_absolute_time ("expiration_time",
@ -9629,7 +9629,7 @@ postgres_lookup_transfer_by_deposit (
struct TALER_MerchantWireHashP wh;
if (no_kyc)
kyc->payment_target_uuid = 0;
kyc->legitimization_uuid = 0;
else
kyc->ok = GNUNET_TIME_absolute_is_future (expiration);
TALER_merchant_wire_signature_hash (payto_uri,

14
src/include/taler_exchange_service.h
View File

@ -2141,7 +2141,7 @@ struct TALER_EXCHANGE_WithdrawResponse
* Payment target that the merchant should use
* to check for its KYC status.
*/
uint64_t payment_target_uuid;
uint64_t legitimization_uuid;
} unavailable_for_legal_reasons;
/**
@ -2262,7 +2262,7 @@ struct TALER_EXCHANGE_BatchWithdrawResponse
* Payment target that the merchant should use
* to check for its KYC status.
*/
uint64_t payment_target_uuid;
uint64_t legitimization_uuid;
} accepted;
/**
@ -3076,7 +3076,7 @@ struct TALER_EXCHANGE_GetDepositResponse
* Payment target that the merchant should use
* to check for its KYC status.
*/
uint64_t payment_target_uuid;
uint64_t legitimization_uuid;
} success;
/**
@ -3094,7 +3094,7 @@ struct TALER_EXCHANGE_GetDepositResponse
* Payment target that the merchant should use
* to check for its KYC status.
*/
uint64_t payment_target_uuid;
uint64_t legitimization_uuid;
/**
* Set to 'true' if the KYC check is already finished and
@ -3553,7 +3553,7 @@ struct TALER_EXCHANGE_WalletKycResponse
* Wallet's payment target UUID. Only valid if
* @e http_status is #MHD_HTTP_OK
*/
uint64_t payment_target_uuid;
uint64_t legitimization_uuid;
};
@ -4879,7 +4879,7 @@ struct TALER_EXCHANGE_AccountMergeResponse
* Payment target that the merchant should use
* to check for its KYC status.
*/
uint64_t payment_target_uuid;
uint64_t legitimization_uuid;
} unavailable_for_legal_reasons;
@ -4988,7 +4988,7 @@ struct TALER_EXCHANGE_PurseCreateMergeResponse
* Payment target that the merchant should use
* to check for its KYC status.
*/
uint64_t payment_target_uuid;
uint64_t legitimization_uuid;
} unavailable_for_legal_reasons;
} details;

3
src/include/taler_exchangedb_plugin.h
View File

@ -2281,8 +2281,7 @@ struct TALER_EXCHANGEDB_KycStatus
* Number that identifies the KYC target the operation
* was about.
*/
// FIXME: rename to 'legitimization_uuid'
uint64_t payment_target_uuid;
uint64_t legitimization_uuid;
/**
* True if the KYC status is "satisfied".

2
src/include/taler_testing_lib.h
View File

@ -2796,7 +2796,7 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
op (kyc_url, const char *) \
op (web_url, const char *) \
op (row, const uint64_t) \
op (payment_target_uuid, const uint64_t) \
op (legitimization_uuid, const uint64_t) \
op (array_length, const unsigned int) \
op (credit_payto_uri, const char *) \
op (debit_payto_uri, const char *) \

6
src/kyclogic/taler-exchange-kyc-tester.c
View File

@ -518,7 +518,7 @@ kyc_provider_account_lookup (
* @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 payment_target_uuid
* @param args one argument with the legitimization_uuid
* @return MHD result code
*/
static MHD_RESULT
@ -599,7 +599,7 @@ handler_kyc_webhook_generic (
* Handle a GET "/kyc-webhook" 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
*/
static MHD_RESULT
@ -619,7 +619,7 @@ handler_kyc_webhook_get (
*
* @param rc request to handle
* @param root uploaded JSON body (can be NULL)
* @param args one argument with the payment_target_uuid
* @param args one argument with the legitimization_uuid
* @return MHD result code
*/
static MHD_RESULT

2
src/lib/exchange_api_batch_withdraw.c
View File

@ -208,7 +208,7 @@ handle_reserve_batch_withdraw_finished (
{
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_uint64 ("legitimization_uuid",
&wr.details.accepted.payment_target_uuid),
&wr.details.accepted.legitimization_uuid),
GNUNET_JSON_spec_end ()
};

4
src/lib/exchange_api_deposits_get.c
View File

@ -182,7 +182,7 @@ handle_deposit_wtid_finished (void *cls,
&dr.details.accepted.execution_time),
GNUNET_JSON_spec_mark_optional (
GNUNET_JSON_spec_uint64 ("legitimization_uuid",
&dr.details.accepted.payment_target_uuid),
&dr.details.accepted.legitimization_uuid),
&no_legi),
GNUNET_JSON_spec_bool ("kyc_ok",
&dr.details.accepted.kyc_ok),
@ -200,7 +200,7 @@ handle_deposit_wtid_finished (void *cls,
break;
}
if (no_legi)
dr.details.accepted.payment_target_uuid = 0;
dr.details.accepted.legitimization_uuid = 0;
dwh->cb (dwh->cb_cls,
&dr);
TALER_EXCHANGE_deposits_get_cancel (dwh);

2
src/lib/exchange_api_kyc_wallet.c
View File

@ -99,7 +99,7 @@ handle_kyc_wallet_finished (void *cls,
{
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_uint64 ("legitimization_uuid",
&ks.payment_target_uuid),
&ks.legitimization_uuid),
GNUNET_JSON_spec_end ()
};

2
src/lib/exchange_api_purse_create_with_merge.c
View File

@ -299,7 +299,7 @@ handle_purse_create_with_merge_finished (void *cls,
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_uint64 (
"legitimization_uuid",
&dr.details.unavailable_for_legal_reasons.payment_target_uuid),
&dr.details.unavailable_for_legal_reasons.legitimization_uuid),
GNUNET_JSON_spec_end ()
};

2
src/lib/exchange_api_purse_merge.c
View File

@ -261,7 +261,7 @@ handle_purse_merge_finished (void *cls,
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_uint64 (
"legitimization_uuid",
&dr.details.unavailable_for_legal_reasons.payment_target_uuid),
&dr.details.unavailable_for_legal_reasons.legitimization_uuid),
GNUNET_JSON_spec_end ()
};

2
src/lib/exchange_api_withdraw.c
View File

@ -162,7 +162,7 @@ handle_reserve_withdraw_finished (
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_uint64 (
"legitimization_uuid",
&wr.details.unavailable_for_legal_reasons.payment_target_uuid),
&wr.details.unavailable_for_legal_reasons.legitimization_uuid),
GNUNET_JSON_spec_end ()
};

4
src/testing/testing_api_cmd_batch_withdraw.c
View File

@ -215,7 +215,7 @@ reserve_batch_withdraw_cb (void *cls,
break;
case MHD_HTTP_ACCEPTED:
/* nothing to check */
ws->kyc_uuid = wr->details.accepted.payment_target_uuid;
ws->kyc_uuid = wr->details.accepted.legitimization_uuid;
break;
case MHD_HTTP_FORBIDDEN:
/* nothing to check */
@ -417,7 +417,7 @@ batch_withdraw_traits (void *cls,
TALER_TESTING_make_trait_reserve_pub (&ws->reserve_pub),
TALER_TESTING_make_trait_amounts (index,
&cs->amount),
TALER_TESTING_make_trait_payment_target_uuid (&ws->kyc_uuid),
TALER_TESTING_make_trait_legitimization_uuid (&ws->kyc_uuid),
TALER_TESTING_make_trait_payto_uri (
(const char **) &ws->reserve_payto_uri),
TALER_TESTING_make_trait_exchange_url (

4
src/testing/testing_api_cmd_deposits_get.c
View File

@ -158,7 +158,7 @@ deposit_wtid_cb (void *cls,
break;
case MHD_HTTP_ACCEPTED:
/* allowed, nothing to check here */
tts->kyc_uuid = dr->details.accepted.payment_target_uuid;
tts->kyc_uuid = dr->details.accepted.legitimization_uuid;
break;
case MHD_HTTP_NOT_FOUND:
/* allowed, nothing to check here */
@ -321,7 +321,7 @@ 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_legitimization_uuid (&tts->kyc_uuid),
TALER_TESTING_make_trait_payto_uri (
(const char **) &tts->merchant_payto_uri),
TALER_TESTING_trait_end ()

2
src/testing/testing_api_cmd_kyc_check_get.c
View File

@ -143,7 +143,7 @@ check_kyc_run (void *cls,
return;
}
if (GNUNET_OK !=
TALER_TESTING_get_trait_payment_target_uuid (res_cmd,
TALER_TESTING_get_trait_legitimization_uuid (res_cmd,
&payment_target))
{
GNUNET_break (0);

4
src/testing/testing_api_cmd_kyc_wallet_get.c
View File

@ -112,7 +112,7 @@ wallet_kyc_cb (void *cls,
switch (wkr->http_status)
{
case MHD_HTTP_OK:
kwg->kyc_uuid = wkr->payment_target_uuid;
kwg->kyc_uuid = wkr->legitimization_uuid;
break;
case MHD_HTTP_NO_CONTENT:
break;
@ -232,7 +232,7 @@ 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_legitimization_uuid (&kwg->kyc_uuid),
TALER_TESTING_make_trait_payto_uri (
(const char **) &kwg->reserve_payto_uri),
TALER_TESTING_trait_end ()

4
src/testing/testing_api_cmd_purse_merge.c
View File

@ -170,7 +170,7 @@ merge_cb (void *cls,
case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
/* KYC required */
ds->kyc_uuid =
dr->details.unavailable_for_legal_reasons.payment_target_uuid;
dr->details.unavailable_for_legal_reasons.legitimization_uuid;
break;
}
@ -385,7 +385,7 @@ merge_traits (void *cls,
TALER_TESTING_make_trait_reserve_pub (&ds->reserve_pub),
TALER_TESTING_make_trait_timestamp (0,
&ds->merge_timestamp),
TALER_TESTING_make_trait_payment_target_uuid (&ds->kyc_uuid),
TALER_TESTING_make_trait_legitimization_uuid (&ds->kyc_uuid),
TALER_TESTING_make_trait_h_payto (&ds->h_payto),
TALER_TESTING_trait_end ()
};

4
src/testing/testing_api_cmd_reserve_purse.c
View File

@ -166,7 +166,7 @@ purse_cb (void *cls,
case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
/* KYC required */
ds->kyc_uuid =
dr->details.unavailable_for_legal_reasons.payment_target_uuid;
dr->details.unavailable_for_legal_reasons.legitimization_uuid;
break;
}
TALER_TESTING_interpreter_next (ds->is);
@ -309,7 +309,7 @@ purse_traits (void *cls,
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_payment_target_uuid (&ds->kyc_uuid),
TALER_TESTING_make_trait_legitimization_uuid (&ds->kyc_uuid),
TALER_TESTING_make_trait_h_payto (&ds->h_payto),
TALER_TESTING_trait_end ()
};

4
src/testing/testing_api_cmd_withdraw.c
View File

@ -319,7 +319,7 @@ reserve_withdraw_cb (void *cls,
case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
/* KYC required */
ws->kyc_uuid =
wr->details.unavailable_for_legal_reasons.payment_target_uuid;
wr->details.unavailable_for_legal_reasons.legitimization_uuid;
break;
default:
/* Unsupported status code (by test harness) */
@ -538,7 +538,7 @@ 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_legitimization_uuid (&ws->kyc_uuid),
TALER_TESTING_make_trait_payto_uri (
(const char **) &ws->reserve_payto_uri),
TALER_TESTING_make_trait_exchange_url (