Updating ledger code to latest in upstream master and moving to 1.1.1

BTCPrivate-Legacy · Apr 20, 2018 · 724571e · 724571e
1 parent cb5fe87
commit 724571e
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 136 deletions.
diff --git a/.idea/electrum.iml b/.idea/electrum.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 BTCP Electrum - Lightweight Bitcoin Private Client
 ==========================================
 
-Current Release (P!1.1.0): https://github.com/BTCPrivate/electrum-btcp/releases/tag/P!1.1.0
+Current Release (P!1.1.1): https://github.com/BTCPrivate/electrum-btcp/releases/tag/P!1.1.1
 
 Originally forked from **spesmilo/electrum**: https://github.com/spesmilo/electrum
 

diff --git a/contrib/build-wine/electrum.nsi b/contrib/build-wine/electrum.nsi
@@ -52,7 +52,7 @@
   Caption "${PRODUCT_NAME}"
 
   ;Adds the Product Version on top of the Version Tab in the Properties of the file.
-  VIProductVersion 1.1.0.0
+  VIProductVersion 1.1.1.0
 
   ;VIAddVersionKey - Adds a field in the Version Tab of the File Properties. This can either be a field provided by the system or a user defined field.
   VIAddVersionKey ProductName "${PRODUCT_NAME} Installer"

diff --git a/lib/version.py b/lib/version.py
@@ -1,5 +1,5 @@
  # version of the client package
-ELECTRUM_VERSION = 'P!1.1.0'
+ELECTRUM_VERSION = 'P!1.1.1'
 # protocol version requested
 PROTOCOL_VERSION = '1.1'
 

diff --git a/plugins/hw_wallet/cmdline.py b/plugins/hw_wallet/cmdline.py
@@ -32,6 +32,9 @@ def stop(self):
     def show_message(self, msg, on_cancel=None):
         print_msg(msg)
 
+    def show_error(self, msg):
+        print_msg(msg)
+
     def update_status(self, b):
         print_error('trezor status', b)