integrate auditor SPAv0.12.1-dev.10

7 files changed, 16 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index bce08c4ea..b192823fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,3 +181,4 @@ src/testing/*/master.priv
 /debian/taler-terms-generator/**
 /debian/taler-terms-generator/*
 release-artifacts
+test-suite.log
diff --git a/contrib/.gitignore b/contrib/.gitignore
index 1e74d37e2..90df41c57 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -1,3 +1,5 @@
 locale/**/*.pot
 Makefile.am
 Makefile.am.ext
+*.log
+*.trs
diff --git a/contrib/aml-spa.lock b/contrib/aml-spa.lock
index 0de787f58..a31499ef5 100644
--- a/contrib/aml-spa.lock
+++ b/contrib/aml-spa.lock
@@ -1 +1 @@
-0.12.9
+0.12.12
diff --git a/contrib/auditor-spa.lock b/contrib/auditor-spa.lock
new file mode 100644
index 000000000..a31499ef5
--- /dev/null
+++ b/contrib/auditor-spa.lock
@@ -0,0 +1 @@
+0.12.12
diff --git a/contrib/check-prebuilt b/contrib/check-prebuilt
index 05ec4f15b..a85dcd264 100755
--- a/contrib/check-prebuilt
+++ b/contrib/check-prebuilt
@@ -6,6 +6,9 @@ import sys
 failed = False
 contrib = os.path.abspath(os.path.dirname(__file__))
 
+auditor_spa_ver_lock = open(contrib + "/" + "auditor-spa.lock").read().strip()
+auditor_spa_ver_prebuilt = open(contrib + "/" + "wallet-core/auditor-backoffice/version.txt").read().strip()
+
 aml_spa_ver_lock = open(contrib + "/" + "aml-spa.lock").read().strip()
 aml_spa_ver_prebuilt = open(contrib + "/" + "wallet-core/aml-backoffice/version.txt").read().strip()
 
@@ -13,16 +16,22 @@ kyc_spa_ver_lock = open(contrib + "/" + "kyc-spa.lock").read().strip()
 kyc_spa_ver_prebuilt = open(contrib + "/" + "wallet-core/kyc/version.txt").read().strip()
 
 if aml_spa_ver_lock != aml_spa_ver_prebuilt:
-    print("AML SPA version mismatch")
+    print("AML SPA version mismatch (contrib/aml-spa.lock)")
     print("lockfile has version", aml_spa_ver_lock)
     print("prebuilt has version", aml_spa_ver_prebuilt)
     failed = True
 
 if kyc_spa_ver_lock != kyc_spa_ver_prebuilt:
-    print("KYC SPA version mismatch")
+    print("KYC SPA version mismatch (contrib/kyc-spa.lock)")
     print("lockfile has version", kyc_spa_ver_lock)
     print("prebuilt has version", kyc_spa_ver_prebuilt)
     failed = True
 
+if auditor_spa_ver_lock != auditor_spa_ver_prebuilt:
+    print("auditor SPA version mismatch (contrib/auditor-spa.lock)")
+    print("lockfile has version", auditor_spa_ver_lock)
+    print("prebuilt has version", auditor_spa_ver_prebuilt)
+    failed = True
+
 if failed:
     sys.exit(1)
diff --git a/contrib/wallet-core b/contrib/wallet-core
-Subproject e78b4120493e89d836b0a87473eea572ad6c2bb
+Subproject c9a7b17cfd2947cb09d2e7d5fba6d2cb0399057
diff --git a/doc/prebuilt b/doc/prebuilt
-Subproject c1a885ac1f9d9b2fdef19a976bed01dab4f7d85
+Subproject ab2e09b5a3711ab04f1f77f79158cc006cab319