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

-integrate new AML APIs into build

Browse Source
This commit is contained in:
Christian Grothoff 2023-01-21 21:38:50 +01:00
parent c1502e507b
commit 31286b66f2
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gana

@ -1 +1 @@
Subproject commit 832685b6a942a6ebbec8e1e5b8c33b6b85b0a727 Subproject commit 66228b8a4306f028d843d78fbfcca54260539ff9

3
src/lib/Makefile.am
View File

@ -21,6 +21,7 @@ libtalerexchange_la_LDFLAGS = \
-version-info 5:0:0 \ -version-info 5:0:0 \
-no-undefined -no-undefined
libtalerexchange_la_SOURCES = \ libtalerexchange_la_SOURCES = \
exchange_api_add_aml_decision.c \
exchange_api_auditor_add_denomination.c \ exchange_api_auditor_add_denomination.c \
exchange_api_batch_deposit.c \ exchange_api_batch_deposit.c \
exchange_api_batch_withdraw.c \ exchange_api_batch_withdraw.c \
@ -37,6 +38,7 @@ libtalerexchange_la_SOURCES = \
exchange_api_kyc_proof.c \ exchange_api_kyc_proof.c \
exchange_api_kyc_wallet.c \ exchange_api_kyc_wallet.c \
exchange_api_link.c \ exchange_api_link.c \
exchange_api_management_add_partner.c \
exchange_api_management_auditor_disable.c \ exchange_api_management_auditor_disable.c \
exchange_api_management_auditor_enable.c \ exchange_api_management_auditor_enable.c \
exchange_api_management_drain_profits.c \ exchange_api_management_drain_profits.c \
@ -47,6 +49,7 @@ libtalerexchange_la_SOURCES = \
exchange_api_management_revoke_signing_key.c \ exchange_api_management_revoke_signing_key.c \
exchange_api_management_set_global_fee.c \ exchange_api_management_set_global_fee.c \
exchange_api_management_set_wire_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_disable.c \
exchange_api_management_wire_enable.c \ exchange_api_management_wire_enable.c \
exchange_api_melt.c \ exchange_api_melt.c \

7
src/lib/exchange_api_add_aml_decision.c
View File

@ -136,7 +136,7 @@ TALER_EXCHANGE_add_aml_decision (
TALER_EXCHANGE_AddAmlDecisionCallback cb, TALER_EXCHANGE_AddAmlDecisionCallback cb,
void *cb_cls) void *cb_cls)
{ {
struct TALER_AmlOfficerPrivateKeyP officer_pub; struct TALER_AmlOfficerPublicKeyP officer_pub;
struct TALER_AmlOfficerSignatureP officer_sig; struct TALER_AmlOfficerSignatureP officer_sig;
struct TALER_EXCHANGE_AddAmlDecision *wh; struct TALER_EXCHANGE_AddAmlDecision *wh;
CURL *eh; CURL *eh;
@ -146,6 +146,7 @@ TALER_EXCHANGE_add_aml_decision (
&officer_pub.eddsa_pub); &officer_pub.eddsa_pub);
TALER_officer_aml_decision_sign (justification, TALER_officer_aml_decision_sign (justification,
decision_time, decision_time,
new_threshold,
h_payto, h_payto,
new_state, new_state,
officer_priv, officer_priv,
@ -187,8 +188,8 @@ TALER_EXCHANGE_add_aml_decision (
&officer_sig), &officer_sig),
GNUNET_JSON_pack_data_auto ("h_payto", GNUNET_JSON_pack_data_auto ("h_payto",
h_payto), h_payto),
GNUNET_JSON_pack_data_uint64 ("state", GNUNET_JSON_pack_uint64 ("state",
(uint32_t) new_state), (uint32_t) new_state),
TALER_JSON_pack_amount ("new_threshold", TALER_JSON_pack_amount ("new_threshold",
new_threshold), new_threshold),
GNUNET_JSON_pack_timestamp ("decision_time", GNUNET_JSON_pack_timestamp ("decision_time",

8
src/lib/exchange_api_management_update_aml_officer.c
View File

@ -175,10 +175,10 @@ TALER_EXCHANGE_management_update_aml_officer (
officer_name), officer_name),
GNUNET_JSON_pack_data_auto ("master_sig", GNUNET_JSON_pack_data_auto ("master_sig",
master_sig), master_sig),
GNUNET_JSON_pack_data_bool ("is_active", GNUNET_JSON_pack_bool ("is_active",
is_active), is_active),
GNUNET_JSON_pack_data_bool ("read_only", GNUNET_JSON_pack_bool ("read_only",
read_only), read_only),
GNUNET_JSON_pack_timestamp ("change_date", GNUNET_JSON_pack_timestamp ("change_date",
change_date)); change_date));
eh = TALER_EXCHANGE_curl_easy_get_ (wh->url); eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);