Added flatpak build manifests with split dependencies

Closes: #1696

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/flatpak/shared-modules"]
+	path = packages/flatpak/shared-modules
+	url = https://github.com/flathub/shared-modules.git

.travis.yml

@@ -1,6 +1,9 @@
 language: python
+cache: pip
+dist: bionic
 python:
-  - "2.7"
+  - "2.7_with_system_site_packages"
+  - "3.7"
 addons:
   apt:
     packages:
@@ -11,9 +14,9 @@ addons:
       - xvfb
 install:
   - pip install -r requirements.txt
-  - ln -s src pybitmessage  # tests environment
   - python setup.py install
+  - export PYTHONWARNINGS=all
 script:
   - python checkdeps.py
   - xvfb-run src/bitmessagemain.py -t
-  - python setup.py test
+  - python -bm tests

checkdeps.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 """
 Check dependencies and give recommendations about how to satisfy them
 

packages/flatpak/org.bitmessage.BaseApp.json

@@ -0,0 +1,57 @@
+{
+ "id": "org.bitmessage.BaseApp",
+ "branch": "19.08",
+ "runtime": "org.freedesktop.Platform",
+ "sdk": "org.freedesktop.Sdk",
+ "runtime-version": "19.08",
+ "separate-locales": false,
+ "modules": [
+  "shared-modules/python2.7/python-2.7.json",
+  "shared-modules/qt4/qt4-4.8.7-minimal.json",
+  {
+    "name": "python-sip",
+    "sources": [
+      {
+        "type": "archive",
+        "url": "https://www.riverbankcomputing.com/static/Downloads/sip/4.19.25/sip-4.19.25.tar.gz",
+        "sha256": "b39d93e937647807bac23579edbff25fe46d16213f708370072574ab1f1b4211"
+      }
+    ],
+    "buildsystem": "simple",
+    "build-commands": [
+      "python configure.py --sip-module PyQt4.sip --no-dist-info",
+      "make",
+      "make install"
+    ]
+  },
+  {
+    "name": "python-qt4",
+    "sources": [
+      {
+        "type": "archive",
+        "url": "http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12.3/PyQt4_gpl_x11-4.12.3.tar.gz",
+        "sha256": "a00f5abef240a7b5852b7924fa5fdf5174569525dc076cd368a566619e56d472"
+      }
+    ],
+    "buildsystem": "simple",
+    "build-commands": [
+      "python configure.py -w --confirm-license",
+      "make",
+      "make install"
+    ]
+  },
+  {
+    "name" : "PyBitmessage-dependencies",
+    "buildsystem" : "simple",
+    "build-options": {
+      "build-args": [
+        "--share=network"
+      ]
+    },
+    "build-commands": [
+      "pip --version",
+      "pip install setuptools msgpack"
+    ]
+  }
+ ]
+}

packages/flatpak/org.bitmessage.PyBitmessage.json

@@ -0,0 +1,48 @@
+{
+    "app-id": "org.bitmessage.PyBitmessage",
+    "runtime": "org.freedesktop.Platform",
+    "runtime-version": "19.08",
+    "branch": "stable",
+    "sdk": "org.freedesktop.Sdk",
+    "base": "org.bitmessage.BaseApp",
+    "command": "pybitmessage",
+    "base-version":"stable",
+    "finish-args" : [
+      "--share=network",
+      "--socket=x11",
+      "--share=ipc",
+      "--filesystem=xdg-config/PyBitmessage:create"
+    ],
+    "modules": [
+      {
+        "name" : "PyBitmessage",
+        "buildsystem" : "simple",
+        "build-options": {
+          "build-args": [
+            "--share=network"
+          ]
+        },
+        "build-commands": [
+          "python --version",
+          "pwd",
+          "ls",
+          "python checkdeps.py",
+          "python setup.py install --prefix=/app --exec-prefix=/app",
+          "sed -i 's~/usr/bin/~/app/bin/~' /app/bin/pybitmessage",
+          "cat /app/bin/pybitmessage",
+          "mv /app/share/applications/pybitmessage.desktop /app/share/applications/org.bitmessage.PyBitmessage.desktop",
+          "sed -i 's~Icon=pybitmessage~Icon=org.bitmessage.PyBitmessage~' /app/share/applications/org.bitmessage.PyBitmessage.desktop",
+          "mv /app/share/icons/hicolor/scalable/apps/pybitmessage.svg /app/share/icons/hicolor/scalable/apps/org.bitmessage.PyBitmessage.svg",
+          "mv /app/share/icons/hicolor/24x24/apps/pybitmessage.png /app/share/icons/hicolor/24x24/apps/org.bitmessage.PyBitmessage.png",
+          "which pybitmessage"
+        ],
+        "sources" : [
+          {
+            "type" : "dir",
+            "path" : "../../"
+          }
+        ]
+      }
+    ]
+  }
+  

packages/flatpak/shared-modules

@@ -0,0 +1 @@
+Subproject commit fd4d38328ccb078b88ad4a891807e593ae8de806

requirements.txt

@@ -1,3 +1,4 @@
+coverage
 python_prctl
 psutil
 pycrypto

setup.py

@@ -95,11 +95,14 @@ if __name__ == "__main__":
             ['desktop/icons/24x24/pybitmessage.png'])
     ]
 
-    if platform.dist()[0] in ('Debian', 'Ubuntu'):
-        data_files += [
-            ("etc/apparmor.d/",
-                ['packages/apparmor/pybitmessage'])
-        ]
+    try:
+        if platform.dist()[0] in ('Debian', 'Ubuntu'):
+            data_files += [
+                ("etc/apparmor.d/",
+                    ['packages/apparmor/pybitmessage'])
+            ]
+    except AttributeError:
+        pass  # FIXME: use distro for more recent python
 
     dist = setup(
         name='pybitmessage',
@@ -116,6 +119,7 @@ if __name__ == "__main__":
         #keywords='',
         install_requires=installRequires,
         tests_require=requirements,
+        test_suite='tests.unittest_discover',
         extras_require=EXTRAS_REQUIRE,
         classifiers=[
             "License :: OSI Approved :: MIT License"

src/addresses.py

@@ -3,10 +3,12 @@ Operations with addresses
 """
 # pylint: disable=redefined-outer-name,inconsistent-return-statements
 import hashlib
+import logging
 from binascii import hexlify, unhexlify
 from struct import pack, unpack
 
-from debug import logger
+
+logger = logging.getLogger('default')
 
 ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
 
@@ -23,8 +25,7 @@ def encodeBase58(num, alphabet=ALPHABET):
     arr = []
     base = len(alphabet)
     while num:
-        rem = num % base
-        num = num // base
+        num, rem = divmod(num, base)
         arr.append(alphabet[rem])
     arr.reverse()
     return ''.join(arr)
@@ -148,16 +149,16 @@ def encodeAddress(version, stream, ripe):
                 'Programming error in encodeAddress: The length of'
                 ' a given ripe hash was not 20.'
             )
-        if ripe[:2] == '\x00\x00':
+        if ripe[:2] == b'\x00\x00':
             ripe = ripe[2:]
-        elif ripe[:1] == '\x00':
+        elif ripe[:1] == b'\x00':
             ripe = ripe[1:]
     elif version == 4:
         if len(ripe) != 20:
             raise Exception(
                 'Programming error in encodeAddress: The length of'
                 ' a given ripe hash was not 20.')
-        ripe = ripe.lstrip('\x00')
+        ripe = ripe.lstrip(b'\x00')
 
     storedBinaryData = encodeVarint(version) + encodeVarint(stream) + ripe
 
@@ -191,8 +192,8 @@ def decodeAddress(address):
         status = 'invalidcharacters'
         return status, 0, 0, ''
     # after converting to hex, the string will be prepended
-    # with a 0x and appended with a L
-    hexdata = hex(integer)[2:-1]
+    # with a 0x and appended with a L in python2
+    hexdata = hex(integer)[2:].rstrip('L')
 
     if len(hexdata) % 2 != 0:
         hexdata = '0' + hexdata
@@ -242,13 +243,13 @@ def decodeAddress(address):
             data[bytesUsedByVersionNumber + bytesUsedByStreamNumber:-4]
         if len(embeddedRipeData) == 19:
             return status, addressVersionNumber, streamNumber, \
-                '\x00' + embeddedRipeData
+                b'\x00' + embeddedRipeData
         elif len(embeddedRipeData) == 20:
             return status, addressVersionNumber, streamNumber, \
                 embeddedRipeData
         elif len(embeddedRipeData) == 18:
             return status, addressVersionNumber, streamNumber, \
-                '\x00\x00' + embeddedRipeData
+                b'\x00\x00' + embeddedRipeData
         elif len(embeddedRipeData) < 18:
             return 'ripetooshort', 0, 0, ''
         elif len(embeddedRipeData) > 20:
@@ -257,7 +258,7 @@ def decodeAddress(address):
     elif addressVersionNumber == 4:
         embeddedRipeData = \
             data[bytesUsedByVersionNumber + bytesUsedByStreamNumber:-4]
-        if embeddedRipeData[0:1] == '\x00':
+        if embeddedRipeData[0:1] == b'\x00':
             # In order to enforce address non-malleability, encoded
             # RIPE data must have NULL bytes removed from the front
             return 'encodingproblem', 0, 0, ''
@@ -265,7 +266,7 @@ def decodeAddress(address):
             return 'ripetoolong', 0, 0, ''
         elif len(embeddedRipeData) < 4:
             return 'ripetooshort', 0, 0, ''
-        x00string = '\x00' * (20 - len(embeddedRipeData))
+        x00string = b'\x00' * (20 - len(embeddedRipeData))
         return status, addressVersionNumber, streamNumber, \
             x00string + embeddedRipeData
 

src/bitmessagecurses/__init__.py

@@ -983,7 +983,7 @@ def sendMessage(sender="", recv="", broadcast=None, subject="", body="", reply=F
 def loadInbox():
     """Load the list of messages"""
     sys.stdout = sys.__stdout__
-    print "Loading inbox messages..."
+    print("Loading inbox messages...")
     sys.stdout = printlog
 
     where = "toaddress || fromaddress || subject || message"
@@ -1035,7 +1035,7 @@ def loadInbox():
 def loadSent():
     """Load the messages that sent"""
     sys.stdout = sys.__stdout__
-    print "Loading sent messages..."
+    print("Loading sent messages...")
     sys.stdout = printlog
 
     where = "toaddress || fromaddress || subject || message"
@@ -1121,7 +1121,7 @@ def loadSent():
 def loadAddrBook():
     """Load address book"""
     sys.stdout = sys.__stdout__
-    print "Loading address book..."
+    print("Loading address book...")
     sys.stdout = printlog
 
     ret = sqlQuery("SELECT label, address FROM addressbook")
@@ -1228,7 +1228,7 @@ def run(stdscr):
 def doShutdown():
     """Shutting the app down"""
     sys.stdout = sys.__stdout__
-    print "Shutting down..."
+    print("Shutting down...")
     sys.stdout = printlog
     shutdown.doCleanShutdown()
     sys.stdout = sys.__stdout__

src/bitmessagemain.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/env python
 """
 The PyBitmessage startup script
 """
@@ -12,10 +12,11 @@ The PyBitmessage startup script
 import os
 import sys
 
-app_dir = os.path.dirname(os.path.abspath(__file__))
-os.chdir(app_dir)
-sys.path.insert(0, app_dir)
-
+try:
+    import pathmagic
+except ImportError:
+    from pybitmessage import pathmagic
+app_dir = pathmagic.setup()
 
 import depends
 depends.check_dependencies()
@@ -320,9 +321,10 @@ class Main(object):
                 receiveQueueThread = ReceiveQueueThread(i)
                 receiveQueueThread.daemon = True
                 receiveQueueThread.start()
-            announceThread = AnnounceThread()
-            announceThread.daemon = True
-            announceThread.start()
+            if config.safeGetBoolean('bitmessagesettings', 'udp'):
+                state.announceThread = AnnounceThread()
+                state.announceThread.daemon = True
+                state.announceThread.start()
             state.invThread = InvThread()
             state.invThread.daemon = True
             state.invThread.start()
@@ -377,11 +379,7 @@ class Main(object):
             test_core_result = test_core.run()
             self.stop()
             test_core.cleanup()
-            sys.exit(
-                'Core tests failed!'
-                if test_core_result.errors or test_core_result.failures
-                else 0
-            )
+            sys.exit(not test_core_result.wasSuccessful())
 
     @staticmethod
     def daemonize():

src/bitmessageqt/settings.py

@@ -19,7 +19,7 @@ import widgets
 from bmconfigparser import BMConfigParser
 from helper_sql import sqlExecute, sqlStoredProcedure
 from helper_startup import start_proxyconfig
-from network import knownnodes
+from network import knownnodes, AnnounceThread
 from network.asyncore_pollchoose import set_rates
 from tr import _translate
 
@@ -138,6 +138,8 @@ class SettingsDialog(QtGui.QDialog):
             config.get('bitmessagesettings', 'port')))
         self.checkBoxUPnP.setChecked(
             config.safeGetBoolean('bitmessagesettings', 'upnp'))
+        self.checkBoxUDP.setChecked(
+            config.safeGetBoolean('bitmessagesettings', 'udp'))
         self.checkBoxAuthentication.setChecked(
             config.getboolean('bitmessagesettings', 'socksauthentication'))
         self.checkBoxSocksListen.setChecked(
@@ -326,7 +328,8 @@ class SettingsDialog(QtGui.QDialog):
                 self.lineEditTCPPort.text()):
             self.config.set(
                 'bitmessagesettings', 'port', str(self.lineEditTCPPort.text()))
-            if not self.config.safeGetBoolean('bitmessagesettings', 'dontconnect'):
+            if not self.config.safeGetBoolean(
+                    'bitmessagesettings', 'dontconnect'):
                 self.net_restart_needed = True
 
         if self.checkBoxUPnP.isChecked() != self.config.safeGetBoolean(
@@ -339,11 +342,26 @@ class SettingsDialog(QtGui.QDialog):
                 upnpThread = upnp.uPnPThread()
                 upnpThread.start()
 
+        udp_enabled = self.checkBoxUDP.isChecked()
+        if udp_enabled != self.config.safeGetBoolean(
+                'bitmessagesettings', 'udp'):
+            self.config.set('bitmessagesettings', 'udp', str(udp_enabled))
+            if udp_enabled:
+                announceThread = AnnounceThread()
+                announceThread.daemon = True
+                announceThread.start()
+            else:
+                try:
+                    state.announceThread.stopThread()
+                except AttributeError:
+                    pass
+
         proxytype_index = self.comboBoxProxyType.currentIndex()
         if proxytype_index == 0:
             if self._proxy_type and state.statusIconColor != 'red':
                 self.net_restart_needed = True
-        elif state.statusIconColor == 'red' and self.config.safeGetBoolean('bitmessagesettings', 'dontconnect'):
+        elif state.statusIconColor == 'red' and self.config.safeGetBoolean(
+                'bitmessagesettings', 'dontconnect'):
             self.net_restart_needed = False
         elif self.comboBoxProxyType.currentText() != self._proxy_type:
             self.net_restart_needed = True
@@ -369,8 +387,11 @@ class SettingsDialog(QtGui.QDialog):
             self.lineEditSocksPassword.text()))
         self.config.set('bitmessagesettings', 'sockslisten', str(
             self.checkBoxSocksListen.isChecked()))
-        if self.checkBoxOnionOnly.isChecked() \
-                and not self.config.safeGetBoolean('bitmessagesettings', 'onionservicesonly'):
+        if (
+            self.checkBoxOnionOnly.isChecked()
+            and not self.config.safeGetBoolean(
+                'bitmessagesettings', 'onionservicesonly')
+        ):
             self.net_restart_needed = True
         self.config.set('bitmessagesettings', 'onionservicesonly', str(
             self.checkBoxOnionOnly.isChecked()))
@@ -432,8 +453,8 @@ class SettingsDialog(QtGui.QDialog):
         acceptableDifficultyChanged = False
 
         if (
-                float(self.lineEditMaxAcceptableTotalDifficulty.text()) >= 1
-                or float(self.lineEditMaxAcceptableTotalDifficulty.text()) == 0
+            float(self.lineEditMaxAcceptableTotalDifficulty.text()) >= 1
+            or float(self.lineEditMaxAcceptableTotalDifficulty.text()) == 0
         ):
             if self.config.get(
                     'bitmessagesettings', 'maxacceptablenoncetrialsperbyte'
@@ -449,8 +470,8 @@ class SettingsDialog(QtGui.QDialog):
                         * defaults.networkDefaultProofOfWorkNonceTrialsPerByte))
                 )
         if (
-                float(self.lineEditMaxAcceptableSmallMessageDifficulty.text()) >= 1
-                or float(self.lineEditMaxAcceptableSmallMessageDifficulty.text()) == 0
+            float(self.lineEditMaxAcceptableSmallMessageDifficulty.text()) >= 1
+            or float(self.lineEditMaxAcceptableSmallMessageDifficulty.text()) == 0
         ):
             if self.config.get(
                     'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes'
@@ -541,8 +562,8 @@ class SettingsDialog(QtGui.QDialog):
         self.parent.updateStartOnLogon()
 
         if (
-                state.appdata != paths.lookupExeFolder()
-                and self.checkBoxPortableMode.isChecked()
+            state.appdata != paths.lookupExeFolder()
+            and self.checkBoxPortableMode.isChecked()
         ):
             # If we are NOT using portable mode now but the user selected
             # that we should...
@@ -564,8 +585,8 @@ class SettingsDialog(QtGui.QDialog):
                 pass
 
         if (
-                state.appdata == paths.lookupExeFolder()
-                and not self.checkBoxPortableMode.isChecked()
+            state.appdata == paths.lookupExeFolder()
+            and not self.checkBoxPortableMode.isChecked()
         ):
             # If we ARE using portable mode now but the user selected
             # that we shouldn't...

src/bitmessageqt/settings.ui

@@ -231,7 +231,7 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
           <string>Bandwidth limit</string>
@@ -322,7 +322,7 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item row="2" column="0">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>Proxy server / Tor</string>
@@ -432,7 +432,14 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="checkBoxUDP">
+         <property name="text">
+          <string>Announce self by UDP</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>

src/bitmessageqt/tests/__init__.py

@@ -2,6 +2,10 @@
 
 from addressbook import TestAddressbook
 from main import TestMain, TestUISignaler
+from settings import TestSettings
 from support import TestSupport
 
-__all__ = ["TestAddressbook", "TestMain", "TestSupport", "TestUISignaler"]
+__all__ = [
+    "TestAddressbook", "TestMain", "TestSettings", "TestSupport",
+    "TestUISignaler"
+]

src/bitmessageqt/tests/settings.py

@@ -0,0 +1,34 @@
+import threading
+import time
+
+from main import TestBase
+from bmconfigparser import BMConfigParser
+from bitmessageqt import settings
+
+
+class TestSettings(TestBase):
+    """A test case for the "Settings" dialog"""
+    def setUp(self):
+        super(TestSettings, self).setUp()
+        self.dialog = settings.SettingsDialog(self.window)
+
+    def test_udp(self):
+        """Test the effect of checkBoxUDP"""
+        udp_setting = BMConfigParser().safeGetBoolean(
+            'bitmessagesettings', 'udp')
+        self.assertEqual(udp_setting, self.dialog.checkBoxUDP.isChecked())
+        self.dialog.checkBoxUDP.setChecked(not udp_setting)
+        self.dialog.accept()
+        self.assertEqual(
+            not udp_setting,
+            BMConfigParser().safeGetBoolean('bitmessagesettings', 'udp'))
+        time.sleep(5)
+        for thread in threading.enumerate():
+            if thread.name == 'Announcer':  # find Announcer thread
+                if udp_setting:
+                    self.fail(
+                        'Announcer thread is running while udp set to False')
+                break
+        else:
+            if not udp_setting:
+                self.fail('No Announcer thread found while udp set to True')

src/bmconfigparser.py

@@ -2,13 +2,22 @@
 BMConfigParser class definition and default configuration settings
 """
 
-import ConfigParser
+import sys
+if sys.version_info[0] == 3:
+    # python 3
+    import configparser as ConfigParser
+    SafeConfigParser = ConfigParser.ConfigParser
+else:
+    # python 2
+    import ConfigParser
+    SafeConfigParser = ConfigParser.SafeConfigParser
+
+import state
+from singleton import Singleton
 import os
 import shutil
 from datetime import datetime
 
-import state
-from singleton import Singleton
 
 BMConfigDefaults = {
     "bitmessagesettings": {
@@ -19,30 +28,32 @@ BMConfigDefaults = {
         "maxtotalconnections": 200,
         "maxuploadrate": 0,
         "apiinterface": "127.0.0.1",
-        "apiport": 8442
+        "apiport": 8442,
+        "udp": "True"
     },
     "threads": {
         "receive": 3,
     },
     "network": {
-        "bind": '',
+        "bind": "",
         "dandelion": 90,
     },
     "inventory": {
         "storage": "sqlite",
-        "acceptmismatch": False,
+        "acceptmismatch": "False",
     },
     "knownnodes": {
         "maxnodes": 20000,
     },
     "zlib": {
-        'maxsize': 1048576
+        "maxsize": 1048576
     }
 }
 
 
 @Singleton
-class BMConfigParser(ConfigParser.SafeConfigParser):
+class BMConfigParser(SafeConfigParser):
+
     """
     Singleton class inherited from :class:`ConfigParser.SafeConfigParser`
     with additional methods specific to bitmessage config.
@@ -59,26 +70,47 @@ class BMConfigParser(ConfigParser.SafeConfigParser):
             raise ValueError("Invalid value %s" % value)
         return ConfigParser.ConfigParser.set(self, section, option, value)
 
-    def get(self, section, option, raw=False, variables=None):
-        # pylint: disable=arguments-differ
-        try:
-            if section == "bitmessagesettings" and option == "timeformat":
+    def get(self, section, option, raw=False, vars=None):
+        if sys.version_info[0] == 3:
+            # pylint: disable=arguments-differ
+           try:
+                if section == "bitmessagesettings" and option == "timeformat":
+                    return ConfigParser.ConfigParser.get(
+                        self, section, option)
+                try:
+                    return self._temp[section][option]
+                except KeyError:
+                    pass
                 return ConfigParser.ConfigParser.get(
-                    self, section, option, raw, variables)
-            try:
-                return self._temp[section][option]
-            except KeyError:
-                pass
-            return ConfigParser.ConfigParser.get(
-                self, section, option, True, variables)
-        except ConfigParser.InterpolationError:
-            return ConfigParser.ConfigParser.get(
-                self, section, option, True, variables)
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) as e:
+                    self, section, option)
+           except ConfigParser.InterpolationError:
+                return ConfigParser.ConfigParser.get(
+                    self, section, option)
+           except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) as e:
+                try:
+                    return BMConfigDefaults[section][option]
+                except (KeyError, ValueError, AttributeError):
+                    raise e
+        else:
+            # pylint: disable=arguments-differ
             try:
-                return BMConfigDefaults[section][option]
-            except (KeyError, ValueError, AttributeError):
-                raise e
+                if section == "bitmessagesettings" and option == "timeformat":
+                    return ConfigParser.ConfigParser.get(
+                        self, section, option, raw, vars)
+                try:
+                    return self._temp[section][option]
+                except KeyError:
+                    pass
+                return ConfigParser.ConfigParser.get(
+                    self, section, option, True, vars)
+            except ConfigParser.InterpolationError:
+                return ConfigParser.ConfigParser.get(
+                    self, section, option, True, vars)
+            except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) as e:
+                try:
+                    return BMConfigDefaults[section][option]
+                except (KeyError, ValueError, AttributeError):
+                    raise e
 
     def setTemp(self, section, option, value=None):
         """Temporary set option to value, not saving."""
@@ -190,3 +222,4 @@ class BMConfigParser(ConfigParser.SafeConfigParser):
         if value < 0 or value > 8:
             return False
         return True
+

src/depends.py

@@ -421,8 +421,8 @@ def check_dependencies(verbose=False, optional=False):
     if sys.hexversion >= 0x3000000:
         logger.error(
             'PyBitmessage does not support Python 3+. Python 2.7.4'
-            ' or greater is required.')
-        has_all_dependencies = False
+            ' or greater is required. Python 2.7.18 is recommended.')
+        sys.exit()
 
     check_functions = [check_ripemd160, check_sqlite, check_openssl]
     if optional:

src/network/announcethread.py

@@ -7,7 +7,6 @@ import state
 from bmconfigparser import BMConfigParser
 from network.assemble import assemble_addr
 from network.connectionpool import BMConnectionPool
-from network.udp import UDPSocket
 from node import Peer
 from threads import StoppableThread
 
@@ -15,12 +14,13 @@ from threads import StoppableThread
 class AnnounceThread(StoppableThread):
     """A thread to manage regular announcing of this node"""
     name = "Announcer"
+    announceInterval = 60
 
     def run(self):
         lastSelfAnnounced = 0
         while not self._stopped and state.shutdown == 0:
             processed = 0
-            if lastSelfAnnounced < time.time() - UDPSocket.announceInterval:
+            if lastSelfAnnounced < time.time() - self.announceInterval:
                 self.announceSelf()
                 lastSelfAnnounced = time.time()
             if processed == 0:

src/network/asyncore_pollchoose.py

@@ -749,7 +749,7 @@ class dispatcher(object):
     def log_info(self, message, log_type='info'):
         """Conditionally print a message"""
         if log_type not in self.ignore_log_types:
-            print '%s: %s' % (log_type, message)
+            print('%s: %s' % (log_type, message))
 
     def handle_read_event(self):
         """Handle a read event"""

src/network/http.py

@@ -18,19 +18,19 @@ class HttpConnection(AdvancedDispatcher):
         self.destination = (host, 80)
         self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
         self.connect(self.destination)
-        print "connecting in background to %s:%i" % (self.destination[0], self.destination[1])
+        print("connecting in background to %s:%i" % self.destination)
 
     def state_init(self):
         self.append_write_buf(
             "GET %s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\n\r\n" % (
                 self.path, self.destination[0]))
-        print "Sending %ib" % (len(self.write_buf))
+        print("Sending %ib" % len(self.write_buf))
         self.set_state("http_request_sent", 0)
         return False
 
     def state_http_request_sent(self):
         if self.read_buf:
-            print "Received %ib" % (len(self.read_buf))
+            print("Received %ib" % len(self.read_buf))
             self.read_buf = b""
         if not self.connected:
             self.set_state("close", 0)
@@ -62,13 +62,13 @@ if __name__ == "__main__":
     for host in ("bootstrap8080.bitmessage.org", "bootstrap8444.bitmessage.org"):
         proxy = Socks5Resolver(host=host)
         while asyncore.socket_map:
-            print "loop %s, len %i" % (proxy.state, len(asyncore.socket_map))
+            print("loop %s, len %i" % (proxy.state, len(asyncore.socket_map)))
             asyncore.loop(timeout=1, count=1)
         proxy.resolved()
 
         proxy = Socks4aResolver(host=host)
         while asyncore.socket_map:
-            print "loop %s, len %i" % (proxy.state, len(asyncore.socket_map))
+            print("loop %s, len %i" % (proxy.state, len(asyncore.socket_map)))
             asyncore.loop(timeout=1, count=1)
         proxy.resolved()
 

src/network/udp.py

@@ -8,6 +8,7 @@ import time
 import protocol
 import state
 from bmproto import BMProto
+from constants import MAX_TIME_OFFSET
 from node import Peer
 from objectracker import ObjectTracker
 from queues import receiveDataQueue
@@ -18,7 +19,6 @@ logger = logging.getLogger('default')
 class UDPSocket(BMProto):  # pylint: disable=too-many-instance-attributes
     """Bitmessage protocol over UDP (class)"""
     port = 8444
-    announceInterval = 60
 
     def __init__(self, host=None, sock=None, announcing=False):
         # pylint: disable=bad-super-call
@@ -82,8 +82,8 @@ class UDPSocket(BMProto):  # pylint: disable=too-many-instance-attributes
             decodedIP = protocol.checkIPAddress(str(ip))
             if stream not in state.streamsInWhichIAmParticipating:
                 continue
-            if (seenTime < time.time() - self.maxTimeOffset
-                    or seenTime > time.time() + self.maxTimeOffset):
+            if (seenTime < time.time() - MAX_TIME_OFFSET
+                    or seenTime > time.time() + MAX_TIME_OFFSET):
                 continue
             if decodedIP is False:
                 # if the address isn't local, interpret it as
@@ -94,9 +94,8 @@ class UDPSocket(BMProto):  # pylint: disable=too-many-instance-attributes
         logger.debug(
             "received peer discovery from %s:%i (port %i):",
             self.destination.host, self.destination.port, remoteport)
-        if self.local:
-            state.discoveredPeers[Peer(self.destination.host, remoteport)] = \
-                time.time()
+        state.discoveredPeers[Peer(self.destination.host, remoteport)] = \
+            time.time()
         return True
 
     def bm_command_portcheck(self):
@@ -125,9 +124,9 @@ class UDPSocket(BMProto):  # pylint: disable=too-many-instance-attributes
 
     def handle_read(self):
         try:
-            (recdata, addr) = self.socket.recvfrom(self._buf_len)
-        except socket.error as e:
-            logger.error("socket error: %s", e)
+            recdata, addr = self.socket.recvfrom(self._buf_len)
+        except socket.error:
+            logger.error("socket error on recvfrom:", exc_info=True)
             return
 
         self.destination = Peer(*addr)
@@ -143,7 +142,7 @@ class UDPSocket(BMProto):  # pylint: disable=too-many-instance-attributes
         try:
             retval = self.socket.sendto(
                 self.write_buf, ('<broadcast>', self.port))
-        except socket.error as e:
-            logger.error("socket error on sendto: %s", e)
+        except socket.error:
+            logger.error("socket error on sendto:", exc_info=True)
             retval = len(self.write_buf)
         self.slice_write_buf(retval)

src/openclpow.py

@@ -1,16 +1,24 @@
-#!/usr/bin/env python2.7
 """
 Module for Proof of Work using OpenCL
 """
+import logging
 import os
 from struct import pack
 
 import paths
 from bmconfigparser import BMConfigParser
-from debug import logger
 from state import shutdown
 
-libAvailable = True
+try:
+    import numpy
+    import pyopencl as cl
+    libAvailable = True
+except ImportError:
+    libAvailable = False
+
+
+logger = logging.getLogger('default')
+
 ctx = False
 queue = False
 program = False
@@ -19,17 +27,10 @@ enabledGpus = []
 vendors = []
 hash_dt = None
 
-try:
-    import pyopencl as cl
-    import numpy
-except ImportError:
-    libAvailable = False
-
 
 def initCL():
     """Initlialise OpenCL engine"""
-    # pylint: disable=global-statement
-    global ctx, queue, program, hash_dt, libAvailable
+    global ctx, queue, program, hash_dt  # pylint: disable=global-statement
     if libAvailable is False:
         return
     del enabledGpus[:]

src/pathmagic.py

@@ -0,0 +1,10 @@
+import os
+import sys
+
+
+def setup():
+    """Add path to this file to sys.path"""
+    app_dir = os.path.dirname(os.path.abspath(__file__))
+    os.chdir(app_dir)
+    sys.path.insert(0, app_dir)
+    return app_dir

src/pyelliptic/arithmetic.py

@@ -16,7 +16,7 @@ def inv(a, n):
     lm, hm = 1, 0
     low, high = a % n, n
     while low > 1:
-        r = high / low
+        r = high // low
         nm, new = hm - lm * r, high - low * r
         lm, low, hm, high = nm, new, lm, low
     return lm % n
@@ -43,8 +43,8 @@ def encode(val, base, minlen=0):
     code_string = get_code_string(base)
     result = ""
     while val > 0:
-        result = code_string[val % base] + result
-        val /= base
+        val, i = divmod(val, base)
+        result = code_string[i] + result
     if len(result) < minlen:
         result = code_string[0] * (minlen - len(result)) + result
     return result
@@ -101,10 +101,11 @@ def base10_multiply(a, n):
         return G
     if n == 1:
         return a
-    if (n % 2) == 0:
-        return base10_double(base10_multiply(a, n / 2))
-    if (n % 2) == 1:
-        return base10_add(base10_double(base10_multiply(a, n / 2)), a)
+    n, m = divmod(n, 2)
+    if m == 0:
+        return base10_double(base10_multiply(a, n))
+    if m == 1:
+        return base10_add(base10_double(base10_multiply(a, n)), a)
     return None
 
 

src/pyelliptic/cipher.py

@@ -1,12 +1,10 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 Symmetric Encryption
 """
 #  Copyright (C) 2011 Yann GUIBET <yannguibet@gmail.com>
 #  See LICENSE for details.
 
-from openssl import OpenSSL
+from .openssl import OpenSSL
 
 
 # pylint: disable=redefined-builtin

src/pyelliptic/ecc.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 Asymmetric cryptography using elliptic curves
 """
@@ -10,9 +8,9 @@ Asymmetric cryptography using elliptic curves
 from hashlib import sha512
 from struct import pack, unpack
 
-from cipher import Cipher
-from hash import equals, hmac_sha256
-from openssl import OpenSSL
+from .cipher import Cipher
+from .hash import equals, hmac_sha256
+from .openssl import OpenSSL
 
 
 class ECC(object):
@@ -82,9 +80,10 @@ class ECC(object):
             self.pubkey_y = None
             self.privkey = None
             raise Exception("Bad ECC keys ...")
-        self.pubkey_x = pubkey_x
-        self.pubkey_y = pubkey_y
-        self.privkey = privkey
+        else:
+            self.pubkey_x = pubkey_x
+            self.pubkey_y = pubkey_y
+            self.privkey = privkey
 
     @staticmethod
     def get_curves():
@@ -210,8 +209,8 @@ class ECC(object):
             if other_key == 0:
                 raise Exception("[OpenSSL] EC_KEY_new_by_curve_name FAIL ...")
 
-            other_pub_key_x = OpenSSL.BN_bin2bn(pubkey_x, len(pubkey_x), None)
-            other_pub_key_y = OpenSSL.BN_bin2bn(pubkey_y, len(pubkey_y), None)
+            other_pub_key_x = OpenSSL.BN_bin2bn(pubkey_x, len(pubkey_x), 0)
+            other_pub_key_y = OpenSSL.BN_bin2bn(pubkey_y, len(pubkey_y), 0)
 
             other_group = OpenSSL.EC_KEY_get0_group(other_key)
             other_pub_key = OpenSSL.EC_POINT_new(other_group)
@@ -232,7 +231,7 @@ class ECC(object):
             if own_key == 0:
                 raise Exception("[OpenSSL] EC_KEY_new_by_curve_name FAIL ...")
             own_priv_key = OpenSSL.BN_bin2bn(
-                self.privkey, len(self.privkey), None)
+                self.privkey, len(self.privkey), 0)
 
             if (OpenSSL.EC_KEY_set_private_key(own_key, own_priv_key)) == 0:
                 raise Exception("[OpenSSL] EC_KEY_set_private_key FAIL ...")
@@ -278,14 +277,16 @@ class ECC(object):
             curve = self.curve
         elif isinstance(curve, str):
             curve = OpenSSL.get_curve(curve)
+        else:
+            curve = curve
         try:
             key = OpenSSL.EC_KEY_new_by_curve_name(curve)
             if key == 0:
                 raise Exception("[OpenSSL] EC_KEY_new_by_curve_name FAIL ...")
             if privkey is not None:
-                priv_key = OpenSSL.BN_bin2bn(privkey, len(privkey), None)
-            pub_key_x = OpenSSL.BN_bin2bn(pubkey_x, len(pubkey_x), None)
-            pub_key_y = OpenSSL.BN_bin2bn(pubkey_y, len(pubkey_y), None)
+                priv_key = OpenSSL.BN_bin2bn(privkey, len(privkey), 0)
+            pub_key_x = OpenSSL.BN_bin2bn(pubkey_x, len(pubkey_x), 0)
+            pub_key_y = OpenSSL.BN_bin2bn(pubkey_y, len(pubkey_y), 0)
 
             if privkey is not None:
                 if (OpenSSL.EC_KEY_set_private_key(key, priv_key)) == 0:
@@ -335,11 +336,9 @@ class ECC(object):
             if key == 0:
                 raise Exception("[OpenSSL] EC_KEY_new_by_curve_name FAIL ...")
 
-            priv_key = OpenSSL.BN_bin2bn(self.privkey, len(self.privkey), None)
-            pub_key_x = OpenSSL.BN_bin2bn(self.pubkey_x, len(self.pubkey_x),
-                                          None)
-            pub_key_y = OpenSSL.BN_bin2bn(self.pubkey_y, len(self.pubkey_y),
-                                          None)
+            priv_key = OpenSSL.BN_bin2bn(self.privkey, len(self.privkey), 0)
+            pub_key_x = OpenSSL.BN_bin2bn(self.pubkey_x, len(self.pubkey_x), 0)
+            pub_key_y = OpenSSL.BN_bin2bn(self.pubkey_y, len(self.pubkey_y), 0)
 
             if (OpenSSL.EC_KEY_set_private_key(key, priv_key)) == 0:
                 raise Exception("[OpenSSL] EC_KEY_set_private_key FAIL ...")
@@ -404,10 +403,8 @@ class ECC(object):
             if key == 0:
                 raise Exception("[OpenSSL] EC_KEY_new_by_curve_name FAIL ...")
 
-            pub_key_x = OpenSSL.BN_bin2bn(self.pubkey_x, len(self.pubkey_x),
-                                          None)
-            pub_key_y = OpenSSL.BN_bin2bn(self.pubkey_y, len(self.pubkey_y),
-                                          None)
+            pub_key_x = OpenSSL.BN_bin2bn(self.pubkey_x, len(self.pubkey_x), 0)
+            pub_key_y = OpenSSL.BN_bin2bn(self.pubkey_y, len(self.pubkey_y), 0)
             group = OpenSSL.EC_KEY_get0_group(key)
             pub_key = OpenSSL.EC_POINT_new(group)
 
@@ -478,9 +475,9 @@ class ECC(object):
         key = sha512(ephem.raw_get_ecdh_key(pubkey_x, pubkey_y)).digest()
         key_e, key_m = key[:32], key[32:]
         pubkey = ephem.get_pubkey()
-        _iv = OpenSSL.rand(OpenSSL.get_cipher(ciphername).get_blocksize())
-        ctx = Cipher(key_e, _iv, 1, ciphername)
-        ciphertext = _iv + pubkey + ctx.ciphering(data)
+        iv = OpenSSL.rand(OpenSSL.get_cipher(ciphername).get_blocksize())
+        ctx = Cipher(key_e, iv, 1, ciphername)
+        ciphertext = iv + pubkey + ctx.ciphering(data)
         mac = hmac_sha256(key_m, ciphertext)
         return ciphertext + mac
 
@@ -489,21 +486,16 @@ class ECC(object):
         Decrypt data with ECIES method using the local private key
         """
         blocksize = OpenSSL.get_cipher(ciphername).get_blocksize()
-        _iv = data[:blocksize]
+        iv = data[:blocksize]
         i = blocksize
-        _, pubkey_x, pubkey_y, _i2 = ECC._decode_pubkey(data[i:])
-        i += _i2
+        _, pubkey_x, pubkey_y, i2 = ECC._decode_pubkey(data[i:])
+        i += i2
         ciphertext = data[i:len(data) - 32]
         i += len(ciphertext)
         mac = data[i:]
         key = sha512(self.raw_get_ecdh_key(pubkey_x, pubkey_y)).digest()
         key_e, key_m = key[:32], key[32:]
         if not equals(hmac_sha256(key_m, data[:len(data) - 32]), mac):
-            print "b1"
             raise RuntimeError("Fail to verify data")
-        print "b2"
-        ctx = Cipher(key_e, _iv, 0, ciphername)
-        print "c"
-        retval = ctx.ciphering(ciphertext)
-        print "d"
-        return retval
+        ctx = Cipher(key_e, iv, 0, ciphername)
+        return ctx.ciphering(ciphertext)

src/pyelliptic/eccblind.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 ECC blind signature functionality based on
 "An Efficient Blind Signature Scheme
@@ -110,7 +109,7 @@ class ECCBlind(object):  # pylint: disable=too-many-instance-attributes
         """
         ECC inversion
         """
-        inverse = OpenSSL.BN_mod_inverse(None, a, self.n, self.ctx)
+        inverse = OpenSSL.BN_mod_inverse(0, a, self.n, self.ctx)
         return inverse
 
     def ec_gen_keypair(self):
@@ -120,7 +119,7 @@ class ECCBlind(object):  # pylint: disable=too-many-instance-attributes
         """
         d = self.ec_get_random()
         Q = OpenSSL.EC_POINT_new(self.group)
-        OpenSSL.EC_POINT_mul(self.group, Q, d, None, None, None)
+        OpenSSL.EC_POINT_mul(self.group, Q, d, 0, 0, 0)
         return (d, Q)
 
     def ec_Ftor(self, F):