gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-exchange] branch master updated: return master_pub top-level in /


From: gnunet
Subject: [taler-exchange] branch master updated: return master_pub top-level in /wire, see #5991
Date: Thu, 12 Dec 2019 15:57:07 +0100

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 204358e2 return master_pub top-level in /wire, see #5991
204358e2 is described below

commit 204358e249cc2ee6025f4a8080db6fc6778af6f2
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Dec 12 15:57:04 2019 +0100

    return master_pub top-level in /wire, see #5991
---
 src/exchange/taler-exchange-httpd_keystate.c   | 2 +-
 src/exchange/taler-exchange-httpd_validation.c | 6 ++++--
 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));
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]