From 1e6091d1dd8ac9886d44969d3756868a4a359780 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 27 Nov 2020 00:05:34 +0100 Subject: cmd to add/del wire methods from list of accounts --- src/lib/exchange_api_management_wire_disable.c | 2 +- src/lib/exchange_api_management_wire_enable.c | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/lib') diff --git a/src/lib/exchange_api_management_wire_disable.c b/src/lib/exchange_api_management_wire_disable.c index b510970ab..157d146b8 100644 --- a/src/lib/exchange_api_management_wire_disable.c +++ b/src/lib/exchange_api_management_wire_disable.c @@ -152,7 +152,7 @@ TALER_EXCHANGE_management_disable_wire ( body = json_pack ("{s:s, s:o, s:o}", "payto_uri", payto_uri, - "master_sig", + "master_sig_del", GNUNET_JSON_from_data_auto (master_sig), "validity_end", GNUNET_JSON_from_time_abs (validity_end)); diff --git a/src/lib/exchange_api_management_wire_enable.c b/src/lib/exchange_api_management_wire_enable.c index 298fe5d25..9de52fe0f 100644 --- a/src/lib/exchange_api_management_wire_enable.c +++ b/src/lib/exchange_api_management_wire_enable.c @@ -122,10 +122,12 @@ handle_auditor_enable_finished (void *cls, * * @param ctx the context * @param url HTTP base URL for the exchange - * @param salt salt to use when hashing the account for the signature * @param payto_uri RFC 8905 URI of the exchange's bank account * @param validity_start when was this decided? - * @param master_sig signature affirming the wire addition + * @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 cb function to call with the exchange's result * @param cb_cls closure for @a cb * @return the request handle; NULL upon error @@ -134,10 +136,10 @@ struct TALER_EXCHANGE_ManagementWireEnableHandle * TALER_EXCHANGE_management_enable_wire ( struct GNUNET_CURL_Context *ctx, const char *url, - const char *salt, const char *payto_uri, struct GNUNET_TIME_Absolute validity_start, - const struct TALER_MasterSignatureP *master_sig, + const struct TALER_MasterSignatureP *master_sig1, + const struct TALER_MasterSignatureP *master_sig2, TALER_EXCHANGE_ManagementWireEnableCallback cb, void *cb_cls) { @@ -159,13 +161,13 @@ TALER_EXCHANGE_management_enable_wire ( GNUNET_free (wh); return NULL; } - body = json_pack ("{s:s, s:s, s:o, s:o}", + body = json_pack ("{s:s, s:s, s:o, s:o, s:o}", "payto_uri", payto_uri, - "salt", - salt, - "master_sig", - GNUNET_JSON_from_data_auto (master_sig), + "master_sig_add", + GNUNET_JSON_from_data_auto (master_sig1), + "master_sig_wire", + GNUNET_JSON_from_data_auto (master_sig2), "validity_start", GNUNET_JSON_from_time_abs (validity_start)); if (NULL == body) -- cgit v1.2.3