From 4719c67a7b2f5be67aa339aa8ce45b30e6f68d7b Mon Sep 17 00:00:00 2001
From: kenshin-samourai <kenshin_samourai@tutanota.com>
Date: Fri, 10 Jul 2020 12:43:44 +0200
Subject: [PATCH] upgrade whirlpool to whirlpool-cli 0.10.8

---
 docker/my-dojo/conf/docker-whirlpool.conf.tpl | 4 ++++
 docker/my-dojo/whirlpool/Dockerfile           | 6 +++---
 docker/my-dojo/whirlpool/restart.sh           | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker/my-dojo/conf/docker-whirlpool.conf.tpl b/docker/my-dojo/conf/docker-whirlpool.conf.tpl
index 2ec295a..762681f 100644
--- a/docker/my-dojo/conf/docker-whirlpool.conf.tpl
+++ b/docker/my-dojo/conf/docker-whirlpool.conf.tpl
@@ -6,6 +6,10 @@
 # Value: on | off
 WHIRLPOOL_INSTALL=off
 
+# Resynchronize mix counters on startup (startup will be slower)
+# Value: on | off
+WHIRLPOOL_RESYNC=off
+
 
 #
 # EXPERT SETTINGS
diff --git a/docker/my-dojo/whirlpool/Dockerfile b/docker/my-dojo/whirlpool/Dockerfile
index ab123b0..2aee4a0 100644
--- a/docker/my-dojo/whirlpool/Dockerfile
+++ b/docker/my-dojo/whirlpool/Dockerfile
@@ -51,10 +51,10 @@ RUN     set -ex && \
 
 # Install whirlpool-cli
 ENV     WHIRLPOOL_URL                 https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads
-ENV     WHIRLPOOL_VERSION             0.10.7
-ENV     WHIRLPOOL_VERSION_HASH        8487fff43052fd9ad1ecd8b6856d9de9
+ENV     WHIRLPOOL_VERSION             0.10.8
+ENV     WHIRLPOOL_VERSION_HASH        7998ea5a9bb180451616809bc346b9ac
 ENV     WHIRLPOOL_JAR                 "whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar"
-ENV     WHIRLPOOL_SHA256              5636a7a5c578b54cfe0c19d187e91255d7473fdedd881d2a90e6a5dcad32dc25
+ENV     WHIRLPOOL_SHA256              62e17b6020d0821a98e99ebb773b46191770ec186ceaa3e616a428f5cafe9f49
 
 RUN     set -ex && \
         cd "$WHIRLPOOL_DIR" && \
diff --git a/docker/my-dojo/whirlpool/restart.sh b/docker/my-dojo/whirlpool/restart.sh
index 94d9181..ee0469e 100644
--- a/docker/my-dojo/whirlpool/restart.sh
+++ b/docker/my-dojo/whirlpool/restart.sh
@@ -22,6 +22,10 @@ else
   whirlpool_options+=(--cli.dojo.url="http://172.30.1.3:80/v2/")
 fi
 
+if [ "$WHIRLPOOL_RESYNC" == "on" ]; then
+  whirlpool_options+=(--resync)
+fi
+
 if [ "$WHIRLPOOL_DEBUG" == "on" ]; then
   whirlpool_options+=(--debug)
 fi