exchange

commit 8296816c8f622ed5171f005f68894aac8427b356
parent 374407fda56c2d5731ee5d4bfea394d4193e5ac3
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon,  5 May 2025 19:24:58 +0200

fix scripts: do not try address check after 3rdparty check, doesn't work well with multiple addresses, just go manual for now

Diffstat:
M
src/kyclogic/taler-exchange-helper-measure-tops-3rdparty-check
 | 
11
++++++-----
M
src/kyclogic/taler-exchange-helper-measure-tops-kyx-check
 | 
19
+++++++++++++------

2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-3rdparty-check b/src/kyclogic/taler-exchange-helper-measure-tops-3rdparty-check
@@ -65,7 +65,7 @@ do
             exit 0
             ;;
         v)
-            echo "$0 v0.0.3"
+            echo "$0 v0.0.4"
             exit 0
             ;;
         V)
@@ -97,6 +97,7 @@ EXPIRATION_TIME=$(echo "$INPUTS" | jq '.context.expiration_time // .current_rule
 
 FORM="error"
 
+INVESTIGATE="false"
 case "$CONTROL3P"
 in
     "false")
@@ -118,17 +119,17 @@ in
         INVESTIGATE="true"
         ;;
     "none")
-        # Immediately trigger address validation.
-        echo "$INPUTS" | taler-exchange-helper-measure-tops-address-check
+        # Move into investigation mode.
+        echo "INFO: Passing data to taler-exchange-helper-measure-inform-investigate" 1>&2
+        NEW_RULES=$(echo "$CURRENT_RULES" | jq '(.rules[] |= if (.rule_name=="deposit-limit-zero" or .measures[0] == "form-vqf-902.11") then .measures=["form-'${FORM}'"] else . end)')
+        echo "$INPUTS" | taler-exchange-helper-measure-inform-investigate
         exit $?
         ;;
     *)
         # Proceed to FORM.
         echo "Selected VQF form ${FORM}." 1>&2
-
         # Force user to fill in $FORM
         NEW_RULES=$(echo "$CURRENT_RULES" | jq '(.rules[] |= if (.rule_name=="deposit-limit-zero" or .measures[0] == "form-vqf-902.11") then .measures=["form-'${FORM}'"] else . end)')
-        INVESTIGATE="false"
         NEW_MEASURES='"form-'${FORM}'"'
         ;;
 esac
diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-kyx-check b/src/kyclogic/taler-exchange-helper-measure-tops-kyx-check
@@ -66,7 +66,7 @@ do
             exit 0
             ;;
         v)
-            echo "$0 v0.0.2"
+            echo "$0 v0.0.3"
             exit 0
             ;;
         V)
@@ -97,6 +97,7 @@ CURRENT_RULES=$(echo "$INPUTS" | jq '.current_rules // null')
 EXPIRATION_TIME=$(echo "$INPUTS" | jq '.context.expiration_time // .current_rules.expiration_time // null')
 
 FORM="error"
+INVESTIGATE="false"
 
 case "$LEGAL_ENTITY"
 in
@@ -108,18 +109,25 @@ in
         ;;
     "FOUNDATION")
         # FIXME: #9825: Not yet supported!
-#        FORM="vqf-902.12"
+        # FORM="vqf-902.12"
+        FORM="inform-investigate"
+        INVESTIGATE="true"
         ;;
     "TRUST")
         # FIXME: #9027: Not yet supported!
-#        FORM="vqf-902.13"
+        # FORM="vqf-902.13"
+        FORM="inform-investigate"
+        INVESTIGATE="true"
         ;;
     "LIFE_INSURANCE")
         # FIXME: #9826: Not yet supported!
-#        FORM="vqf-902.15"
+        # FORM="vqf-902.15"
+        FORM="inform-investigate"
+        INVESTIGATE="true"
         ;;
     "OTHER")
         FORM="vqf-902.9"
+        INVESTIGATE="true"
         ;;
 esac
 
@@ -130,7 +138,7 @@ in
     "error")
         # This should not happen, immediately trigger investigation and show error to the user.
         echo "ERROR: Unexpected legal entity '${LEGAL_ENTITY}'" 1>&2
-        NEW_RULES=$(echo "$CURRENT_RULES" | jq '(.rules[] |= if (.measures[0]=="kyx") then .measures=["form-info-internal-error"] else . end)')
+        NEW_RULES=$(echo "$CURRENT_RULES" | jq '(.rules[] |= if (.measures[0]=="kyx") then .measures=["inform-internal-error"] else . end)')
         INVESTIGATE="true"
         ;;
     "none")
@@ -143,7 +151,6 @@ in
         echo "Selected VQF form ${FORM}." 1>&2
         # Force user to fill in $FORM
         NEW_RULES=$(echo "$CURRENT_RULES" | jq '(.rules[] |= if (.measures[0]=="kyx") then .measures=["form-'${FORM}'"] else . end)')
-        INVESTIGATE="false"
         NEW_MEASURES='"form-'${FORM}'"'
         ;;
 esac