exchange

commit d8c0996e3e4e9795211b04f6f1972342359d28b8
parent 0cb5ff1e04369d4dc5d3a0a8423ab557428fa08b
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Mon,  5 May 2025 16:05:24 +0200

do not drop custom_measures when clearing ToS acceptance measure

Diffstat:
M
src/kyclogic/taler-exchange-helper-measure-validate-accepted-tos
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/kyclogic/taler-exchange-helper-measure-validate-accepted-tos b/src/kyclogic/taler-exchange-helper-measure-validate-accepted-tos
@@ -69,7 +69,7 @@ do
             exit 0
             ;;
         v)
-            echo "$0 v0.0.1"
+            echo "$0 v0.0.2"
             exit 0
             ;;
         V)
@@ -104,6 +104,7 @@ EXPIRATION_STAMP=$((VALIDITY_YEARS * 365 * 24 * 60 * 60 + $(date +%s)))
 EXPIRATION_TIME=$(jq -n --argjson es "$EXPIRATION_STAMP" '{"t_s":$es}')
 
 SUCCESSOR_MEASURE=$(echo "$INPUTS" | jq '.context.successor_measure // .current_rules.successor_measure // null')
+CUSTOM_MEASURES=$(echo "$INPUTS" | jq '.context.custom_measures // null')
 
 # Validate accepted ToS version
 if eval echo "$TOS_ACCEPTED" | grep "${EXCHANGE_AML_PROGRAM_TOPS_ENABLE_DEPOSITS_TOS_NAME}" > /dev/null
@@ -123,7 +124,8 @@ fi
 jq -n \
     --argjson et "$EXPIRATION_TIME" \
     --argjson sm "$SUCCESSOR_MEASURE" \
+    --argjson cm "$CUSTOM_MEASURES" \
     --argjson nr "$NEW_RULES" \
-    '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":{}})}|del(..|nulls)'
+    '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":{}+$cm})}|del(..|nulls)'
 
 exit 0