From 5b0f4ae9e68c3f5065c2c62bed7c7d3bc0b4423a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 9 Apr 2024 17:45:08 +0200 Subject: implement protocol v14 / fix #8717 --- src/lib/merchant_api_get_config.c | 4 ++-- src/lib/merchant_api_merchant_get_order.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/merchant_api_get_config.c b/src/lib/merchant_api_get_config.c index ddbc20a3..b4b700bd 100644 --- a/src/lib/merchant_api_get_config.c +++ b/src/lib/merchant_api_get_config.c @@ -34,12 +34,12 @@ * Which version of the Taler protocol is implemented * by this library? Used to determine compatibility. */ -#define MERCHANT_PROTOCOL_CURRENT 13 +#define MERCHANT_PROTOCOL_CURRENT 14 /** * How many configs are we backwards-compatible with? */ -#define MERCHANT_PROTOCOL_AGE 1 +#define MERCHANT_PROTOCOL_AGE 2 /** * How many exchanges do we allow at most per merchant? diff --git a/src/lib/merchant_api_merchant_get_order.c b/src/lib/merchant_api_merchant_get_order.c index 3a49db34..3bd4003b 100644 --- a/src/lib/merchant_api_merchant_get_order.c +++ b/src/lib/merchant_api_merchant_get_order.c @@ -202,6 +202,11 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh, &wire_details), GNUNET_JSON_spec_array_const ("refund_details", &refund_details), + /* Only available since **v14** */ + GNUNET_JSON_spec_mark_optional ( + GNUNET_JSON_spec_timestamp ("last_payment", + &osr->details.ok.details.paid.last_payment), + NULL), GNUNET_JSON_spec_end () }; -- cgit v1.2.3