Fixes

- Qt six import was broken
- variable in Qt support interface rename incomplete
- objectProcessor wasn't handling memoryview correctly

Author: PeterSurda

src/bitmessageqt/__init__.py

@@ -56,8 +56,7 @@
 import bitmessage_icons_rc  # noqa:F401 pylint: disable=unused-import
 import helper_sent
 
-from six.moves import iteritems, itervalues, range as xrange
-from six import text_type
+from six import iteritems, itervalues, text_type
 
 try:
     from plugins.plugin import get_plugin, get_plugins

src/bitmessageqt/support.py

@@ -141,7 +141,7 @@ def createSupportMessage(myapp):
     if paths.frozen:
         frozen = paths.frozen
     portablemode = "True" if state.appdata == paths.lookupExeFolder() else "False"
-    cpow = "True" if proofofwork.bmpow else "False"
+    cpow = "True" if proofofwork.BMPOW else "False"
     openclpow = str(
         config.safeGet('bitmessagesettings', 'opencl')
     ) if openclEnabled() else "None"

src/class_objectProcessor.py

@@ -141,15 +141,19 @@ def checkackdata(data):
         # bypass nonce and time, retain object type/version/stream + body
         readPosition = 16
 
-        if data[readPosition:] in state.ackdataForWhichImWatching:
+        # data may be a memoryview, which is not hashable and thus
+        # cannot be used as a dictionary key; convert the slice to bytes.
+        ackcheckdata = bytes(data[readPosition:])
+
+        if ackcheckdata in state.ackdataForWhichImWatching:
             logger.info('This object is an acknowledgement bound for me.')
-            del state.ackdataForWhichImWatching[data[readPosition:]]
+            del state.ackdataForWhichImWatching[ackcheckdata]
             sqlExecute(
                 "UPDATE sent SET status='ackreceived', lastactiontime=?"
-                " WHERE ackdata=?", int(time.time()), data[readPosition:])
+                " WHERE ackdata=?", int(time.time()), ackcheckdata)
             queues.UISignalQueue.put((
                 'updateSentItemStatusByAckdata', (
-                    data[readPosition:],
+                    ackcheckdata,
                     _translate(
                         "MainWindow",
                         "Acknowledgement of the message received %1"
@@ -208,7 +212,9 @@ def processgetpubkey(data):
 
         myAddress = ''
         if requestedAddressVersionNumber <= 3:
-            requestedHash = data[readPosition:readPosition + 20]
+            # data may be a memoryview; convert slices to bytes so they
+            # are hashable and can be used as dictionary keys.
+            requestedHash = bytes(data[readPosition:readPosition + 20])
             if len(requestedHash) != 20:
                 return logger.debug(
                     'The length of the requested hash is not 20 bytes.'
@@ -220,7 +226,8 @@ def processgetpubkey(data):
             if requestedHash in shared.myAddressesByHash:
                 myAddress = shared.myAddressesByHash[requestedHash]
         elif requestedAddressVersionNumber >= 4:
-            requestedTag = data[readPosition:readPosition + 32]
+            # data may be a memoryview; convert to bytes for hashability.
+            requestedTag = bytes(data[readPosition:readPosition + 32])
             if len(requestedTag) != 32:
                 return logger.debug(
                     'The length of the requested tag is not 32 bytes.'
@@ -413,7 +420,8 @@ def processpubkey(self, data):
                     '(within processpubkey) payloadLength less than 350.'
                     ' Sanity check failed.')
 
-            tag = data[readPosition:readPosition + 32]
+            # data may be a memoryview; convert to bytes for hashability.
+            tag = bytes(data[readPosition:readPosition + 32])
             if tag not in state.neededPubkeys:
                 return logger.info(
                     'We don\'t need this v4 pubkey. We didn\'t ask for it.')