summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-12-12 15:57:04 +0100
committerChristian Grothoff <christian@grothoff.org>2019-12-12 15:57:04 +0100
commit204358e249cc2ee6025f4a8080db6fc6778af6f2 (patch)
tree789c88f8a7b1115cc93f86f8598d3a2707c76213
parent97810cc46f7256f3780f3e5193f8f51ce5b385b5 (diff)
downloadexchange-204358e249cc2ee6025f4a8080db6fc6778af6f2.tar.gz
exchange-204358e249cc2ee6025f4a8080db6fc6778af6f2.tar.bz2
exchange-204358e249cc2ee6025f4a8080db6fc6778af6f2.zip
return master_pub top-level in /wire, see #5991
-rw-r--r--src/exchange/taler-exchange-httpd_keystate.c2
-rw-r--r--src/exchange/taler-exchange-httpd_validation.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index e7b42d3c..4115fe66 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -44,7 +44,7 @@
* #TALER_PROTOCOL_CURRENT and #TALER_PROTOCOL_AGE in
* exchange_api_handle.c!
*/
-#define TALER_PROTOCOL_VERSION "5:0:1"
+#define TALER_PROTOCOL_VERSION "6:0:0"
/**
diff --git a/src/exchange/taler-exchange-httpd_validation.c b/src/exchange/taler-exchange-httpd_validation.c
index 0be21528..67caf133 100644
--- a/src/exchange/taler-exchange-httpd_validation.c
+++ b/src/exchange/taler-exchange-httpd_validation.c
@@ -356,9 +356,11 @@ TEH_VALIDATION_get_wire_response ()
if ( (0 == json_array_size (wire_accounts_array)) ||
(0 == json_object_size (wire_fee_object)) )
return NULL;
- return json_pack ("{s:O, s:O}",
+ return json_pack ("{s:O, s:O, s:o}",
"accounts", wire_accounts_array,
- "fees", wire_fee_object);
+ "fees", wire_fee_object,
+ "master_pub", GNUNET_JSON_from_data_auto (
+ &TEH_master_public_key));
}