From 367bc8ac8b54ce505439dc706a5c30c4fecd0f6f Mon Sep 17 00:00:00 2001
From: Toporin <satochip.wallet@gmail.com>
Date: Tue, 23 Jun 2020 14:00:32 +0100
Subject: [PATCH] Satochip-Bridge v0.2.6-0.11.2:  Change websocket port

    * previously MyCrypto connected to the bridge on port 8000
    * Now we use port 8397 to limit risk of conflict with another service
---
 .gitignore                            | 1 +
 contrib/build-linux/appimage/build.sh | 4 ++--
 satochip_bridge/SatochipBridge.py     | 4 ++--
 satochip_bridge/version.py            | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b73e433..e6dd098 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ contrib/build-linux/appimage/.cache/
 contrib/build-wine/.cache/
 contrib/build-wine/dist/
 contrib/build-wine/build/
+contrib/build-wine/fresh_clone/
 contrib/build-wine/*.spec
 contrib/build-windows/dist/
 contrib/build-windows/build/
diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh
index 7c44f4a..fa61585 100755
--- a/contrib/build-linux/appimage/build.sh
+++ b/contrib/build-linux/appimage/build.sh
@@ -205,11 +205,11 @@ find "$APPDIR" -path '*/__pycache__*' -delete
 # Import exception for eth_keys keyAPI
 # DistributionNotFound(Requirement.parse('eth-utils'), None)
 #for f in "$PYDIR"/site-packages/jsonschema-*.dist-info; do mv "$f" "$(echo "$f" | sed s/\.dist-info/\.dist-info2/)"; done
-for f in "$PYDIR"/site-packages/eth_utils-*.dist-info; do mv "$f" "$(echo "$f" | sed s/\.dist-info/\.dist-info2/)"; done
+#for f in "$PYDIR"/site-packages/eth_utils-*.dist-info; do mv "$f" "$(echo "$f" | sed s/\.dist-info/\.dist-info2/)"; done
 rm -rf "$PYDIR"/site-packages/*.dist-info/
 rm -rf "$PYDIR"/site-packages/*.egg-info/
 #for f in "$PYDIR"/site-packages/jsonschema-*.dist-info2; do mv "$f" "$(echo "$f" | sed s/\.dist-info2/\.dist-info/)"; done
-for f in "$PYDIR"/site-packages/eth_utils-*.dist-info2; do mv "$f" "$(echo "$f" | sed s/\.dist-info2/\.dist-info/)"; done
+#for f in "$PYDIR"/site-packages/eth_utils-*.dist-info2; do mv "$f" "$(echo "$f" | sed s/\.dist-info2/\.dist-info/)"; done
 
 find -exec touch -h -d '2000-11-11T11:11:11+00:00' {} +
 
diff --git a/satochip_bridge/SatochipBridge.py b/satochip_bridge/SatochipBridge.py
index 7eca475..ae8f337 100644
--- a/satochip_bridge/SatochipBridge.py
+++ b/satochip_bridge/SatochipBridge.py
@@ -39,7 +39,7 @@
 logger = logging.getLogger(__name__)
 #logger.setLevel(logging.DEBUG)
 
-logger.warning("A loglevel: "+ str(logger.getEffectiveLevel()) )
+logger.warning("loglevel: "+ str(logger.getEffectiveLevel()) )
 
 #handler= HandlerTxt()
 handler= HandlerSimpleGUI(logger.getEffectiveLevel())
@@ -262,7 +262,7 @@ def my_threaded_func(server):
     server.serveforever()
     
 logger.info("Launching server...")
-default_port= 8000#8397 # 'Sa' in ascii, as in 'Satochip!'
+default_port= 8397 # 'Sa' in ascii, as in 'Satochip!'
 server = SimpleWebSocketServer('', default_port, SatochipBridge)
 thread = threading.Thread(target=my_threaded_func, args=(server,))
 thread.start()
diff --git a/satochip_bridge/version.py b/satochip_bridge/version.py
index 7a0b167..8cccf16 100644
--- a/satochip_bridge/version.py
+++ b/satochip_bridge/version.py
@@ -6,4 +6,5 @@
 # v0.2.3-0.11.2: windows & linux packaging
 # v0.2.4-0.11.2: patch - replace Exceptions with Error messages
 # v0.2.5-0.11.2: add prompts to confirm actions 
-SATOCHIP_BRIDGE_VERSION = '0.2.5-0.11.2' # version of the client package
+# v0.2.6-0.11.2: change websocket port to 8397
+SATOCHIP_BRIDGE_VERSION = '0.2.6-0.11.2' # version of the client package