Merge remote-tracking branch 'refs/remotes/origin/master'

6 files changed, 27 insertions, 17 deletions

diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index 9912a02af..65e77b04d 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -59,7 +59,7 @@ LIBEUFIN_SETTLE_TIME=1
 # Cleanup exchange and libeufin between runs.
 function cleanup()
 {
-    if test ! -z "${EPID:-}"
+    if [ ! -z "${EPID:-}" ]
     then
         echo -n "Stopping exchange $EPID..."
         kill -TERM "$EPID"
@@ -74,7 +74,7 @@ function cleanup()
 function exit_cleanup()
 {
     echo "Running exit-cleanup"
-    if test ! -z "${POSTGRES_PATH:-}"
+    if [ ! -z "${POSTGRES_PATH:-}" ]
     then
         echo "Stopping Postgres at ${POSTGRES_PATH}"
         "${POSTGRES_PATH}/pg_ctl" \
@@ -136,7 +136,7 @@ function pre_audit () {
         exit_skip "Failed to launch Nexus"
     fi
     echo " DONE"
-    if test "${1:-no}" = "aggregator"
+    if [ "${1:-no}" = "aggregator" ]
     then
         echo -n "Running exchange aggregator ..."
         taler-exchange-aggregator \
@@ -313,7 +313,7 @@ function post_audit () {
 # Pass "drain" as $2 to run a drain operation as well.
 function run_audit () {
     pre_audit "${1:-no}"
-    if test "${2:-no}" = "drain"
+    if [ "${2:-no}" = "drain" ]
     then
         echo -n "Starting exchange..."
         taler-exchange-httpd \
diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh
index 8a16e6930..cb0273e30 100755
--- a/src/testing/taler-unified-setup.sh
+++ b/src/testing/taler-unified-setup.sh
@@ -259,7 +259,7 @@ register_bank_account() {
         IS_EXCHANGE="false"
     fi
     MAYBE_IBAN="${4:-}"
-    if test -n "$MAYBE_IBAN";
+    if [ -n "$MAYBE_IBAN" ]
     then
         # shellcheck disable=SC2001
         ENAME=$(echo "$3" | sed -e "s/ /+/g")
diff --git a/src/util/taler-exchange-secmod-cs.conf b/src/util/taler-exchange-secmod-cs.conf
index 5085eab79..fa3cdba40 100644
--- a/src/util/taler-exchange-secmod-cs.conf
+++ b/src/util/taler-exchange-secmod-cs.conf
@@ -8,16 +8,16 @@
 OVERLAP_DURATION = 5 m
 
 # Where do we store the generated private keys.
-KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-cs/keys
+KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-cs/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-cs/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-cs/server.sock
 
 # Directory for clients.
-CLIENT_DIR = $TALER_RUNTIME_DIR/exchange-secmod-cs/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-cs/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-cs/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-cs/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/taler-exchange-secmod-eddsa.conf b/src/util/taler-exchange-secmod-eddsa.conf
index ea09f0334..0cb4a4ffc 100644
--- a/src/util/taler-exchange-secmod-eddsa.conf
+++ b/src/util/taler-exchange-secmod-eddsa.conf
@@ -8,16 +8,16 @@
 OVERLAP_DURATION = 5m
 
 # Where do we store the private keys.
-KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-eddsa/keys
+KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-eddsa/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-eddsa/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-eddsa/server.sock
 
 # Directory for clients.
-CLIENT_DIR = $TALER_RUNTIME_DIR/exchange-secmod-eddsa/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-eddsa/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-eddsa/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-eddsa/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/taler-exchange-secmod-rsa.conf b/src/util/taler-exchange-secmod-rsa.conf
index dfa87f050..7b16ad114 100644
--- a/src/util/taler-exchange-secmod-rsa.conf
+++ b/src/util/taler-exchange-secmod-rsa.conf
@@ -8,16 +8,16 @@
 OVERLAP_DURATION = 5 m
 
 # Where do we store the generated private keys.
-KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-rsa/keys
+KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-rsa/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-rsa/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-rsa/server.sock
 
 # Directory for clients.
-CLIENT_DIR = $TALER_RUNTIME_DIR/exchange-secmod-rsa/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-rsa/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-rsa/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-rsa/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/wallet_signatures.c b/src/util/wallet_signatures.c
index 0b6ab5432..ebdb7eab9 100644
--- a/src/util/wallet_signatures.c
+++ b/src/util/wallet_signatures.c
@@ -201,6 +201,16 @@ TALER_wallet_deposit_verify (
                      amount);
   TALER_amount_hton (&dr.deposit_fee,
                      deposit_fee);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Validating deposit with hash %s, wallet timestamp %llu and refund deadline %llu by %s\n",
+              GNUNET_h2s (&h_contract_terms->hash),
+              (unsigned long long) wallet_timestamp.abs_time.abs_value_us,
+              (unsigned long long) refund_deadline.abs_time.abs_value_us,
+              TALER_B2S (merchant_pub));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Denomination is %s, wire target is %s\n",
+              GNUNET_h2s (&h_denom_pub->hash),
+              TALER_B2S (h_wire));
   if (GNUNET_OK !=
       GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_WALLET_COIN_DEPOSIT,
                                   &dr,