.gitignore

@@ -3,3 +3,6 @@
 **.DS_Store
 src/build
 src/dist
+src/.project
+src/.pydevproject
+src/.settings/

Makefile

@@ -1,50 +1,45 @@
 APP=pybitmessage
-VERSION=0.3.3-2
+VERSION=0.3.4
-DEST_SHARE=$(DESTDIR)/usr/share
+RELEASE=1
-DEST_APP=$(DEST_SHARE)/$(APP)
+ARCH_TYPE=`uname -m`
 
 all:
- 
 debug:
-
 source:
-	tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude-vcs
+	tar -cvzf ../${APP}_${VERSION}.orig.tar.gz ../${APP}-${VERSION} --exclude-vcs
-
 install:
-	mkdir -m 755 -p $(DESTDIR)/usr/bin
+	mkdir -p ${DESTDIR}/usr
-	mkdir -m 755 -p $(DEST_APP)
+	mkdir -p ${DESTDIR}/usr/bin
-	mkdir -m 755 -p $(DEST_SHARE)/applications
+	mkdir -m 755 -p ${DESTDIR}/usr/share
-	mkdir -m 755 -p $(DEST_APP)/images
+	mkdir -m 755 -p ${DESTDIR}/usr/share/man
-	mkdir -m 755 -p $(DEST_APP)/pyelliptic
+	mkdir -m 755 -p ${DESTDIR}/usr/share/man/man1
-	mkdir -m 755 -p $(DEST_APP)/socks
+	install -m 644 man/${APP}.1.gz ${DESTDIR}/usr/share/man/man1
-	mkdir -m 755 -p $(DEST_APP)/bitmessageqt
+	mkdir -m 755 -p ${DESTDIR}/usr/share/${APP}
-	mkdir -m 755 -p $(DEST_SHARE)/pixmaps
+	mkdir -m 755 -p ${DESTDIR}/usr/share/applications
-	mkdir -m 755 -p $(DEST_SHARE)/icons
+	mkdir -m 755 -p ${DESTDIR}/usr/share/pixmaps
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor
+	mkdir -m 755 -p ${DESTDIR}/usr/share/icons
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/scalable
+	mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/scalable/apps
+	mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor/scalable
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24
+	mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24/apps
+	mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor/24x24
-
+	mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor/24x24/apps
-	install -m 644 src/*.ui $(DEST_APP)
+	install -m 644 desktop/${APP}.desktop ${DESTDIR}/usr/share/applications/${APP}.desktop
-	install -m 644 src/*.py $(DEST_APP)
+	install -m 644 desktop/icon24.png ${DESTDIR}/usr/share/icons/hicolor/24x24/apps/${APP}.png
-	install -m 644 src/*.qrc $(DEST_APP)
+	cp -rf src/* ${DESTDIR}/usr/share/${APP}
-
+	echo '#!/bin/sh' > ${DESTDIR}/usr/bin/${APP}
-	install -m 644 src/images/*.png $(DEST_APP)/images
+	echo 'cd /usr/share/pybitmessage' >> ${DESTDIR}/usr/bin/${APP}
-	install -m 644 src/images/*.ico $(DEST_APP)/images
+	echo 'LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}/usr/bin/${APP}
-	install -m 644 src/pyelliptic/*.py $(DEST_APP)/pyelliptic
+	chmod +x ${DESTDIR}/usr/bin/${APP}
-	install -m 644 src/socks/*.py $(DEST_APP)/socks
+uninstall:
-	install -m 644 src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt
+	rm -f /usr/share/man/man1/${APP}.1.gz
-	install -m 755 debian/pybm $(DESTDIR)/usr/bin/$(APP)
+	rm -rf /usr/share/${APP}
-
+	rm -f /usr/bin/${APP}
-	install -m 644 desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP).desktop
+	rm -f /usr/share/applications/${APP}.desktop
-	install -m 644 src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png
+	rm -f /usr/share/icons/hicolor/scalable/apps/${APP}.svg
-	install -m 644 desktop/can-icon.svg $(DEST_SHARE)/icons/hicolor/scalable/apps/$(APP).svg
+	/usr/share/pixmaps/${APP}.svg
-	install -m 644 desktop/can-icon.svg $(DEST_SHARE)/pixmaps/$(APP).svg
-
 clean:
-	rm -rf debian/$(APP)
+	rm -f ${APP} \#* \.#* gnuplot* *.png debian/*.substvars debian/*.log
-	rm -f ../$(APP)_*.deb ../$(APP)_*.asc ../$(APP)_*.dsc ../$(APP)*.changes
+	rm -fr deb.* debian/${APP} rpmpackage/${ARCH_TYPE}
-	rm -f *.sh~ src/*.pyc src/socks/*.pyc src/pyelliptic/*.pyc
+	rm -f ../${APP}*.deb ../${APP}*.changes ../${APP}*.asc ../${APP}*.dsc
-	rm -f *.deb \#* \.#* debian/*.log debian/*.substvars
+	rm -f rpmpackage/*.src.rpm archpackage/*.gz archpackage/*.xz
-	rm -f Makefile~
+	rm -f  puppypackage/*.gz puppypackage/*.pet slackpackage/*.txz

arch.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+APP=pybitmessage
+PREV_VERSION=0.3.4
+VERSION=0.3.4
+RELEASE=1
+ARCH_TYPE=`uname -m`
+CURRDIR=`pwd`
+SOURCE=archpackage/${APP}-${VERSION}.tar.gz
+
+# Update version numbers automatically - so you don't have to
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile debian.sh rpm.sh puppy.sh ebuild.sh slack.sh
+sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec
+sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec
+sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD
+sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD
+sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs
+sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
+sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
+
+
+# Create the source code
+make clean
+rm -f archpackage/*.gz
+
+# having the root directory called name-version seems essential
+mv ../${APP} ../${APP}-${VERSION}
+tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
+
+# rename the root directory without the version number
+mv ../${APP}-${VERSION} ../${APP}
+
+# calculate the MD5 checksum
+CHECKSM=$(md5sum ${SOURCE})
+sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD
+
+cd archpackage
+
+# Create the package
+tar -c -f ${APP}-${VERSION}.pkg.tar .
+sync
+xz ${APP}-${VERSION}.pkg.tar
+sync
+
+# Move back to the original directory
+cd ${CURRDIR}
+

archpackage/PKGBUILD

@@ -0,0 +1,31 @@
+# Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
+pkgname=pybitmessage
+pkgver=0.3.4
+pkgrel=1
+pkgdesc="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs."
+arch=('i686' 'x86_64')
+url="https://github.com/Bitmessage/PyBitmessage"
+license=('MIT')
+groups=()
+depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl')
+makedepends=()
+optdepends=('python2-gevent')
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=($pkgname-$pkgver.tar.gz)
+noextract=()
+md5sums=()
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}

configure

@@ -0,0 +1 @@
+ 

debian.sh

@@ -1,31 +1,46 @@
-# To build a debian package first ensure that the code exists
-# within a directory called pybitmessage-x.x.x (where the x's
-# are the version number), make sure that the VERSION parameter
-# within debian/rules and this script are correct, then run
-# this script.
-
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.3.2
+PREV_VERSION=0.3.4
-VERSION=0.3.3-2
+VERSION=0.3.4
-ARCH_TYPE=all
+RELEASE=1
+ARCH_TYPE=`uname -m`
+DIR=${APP}-${VERSION}
 
-#update version numbers automatically - so you don't have to
+if [ $ARCH_TYPE == "x86_64" ]; then
-sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile
+    ARCH_TYPE="amd64"
-sed -i 's/'''${PREV_VERSION}'''/'''${VERSION}'''/g' src/shared.py 
+fi
+if [ $ARCH_TYPE == "i686" ]; then
+    ARCH_TYPE="i386"
+fi
+
+
+# Update version numbers automatically - so you don't have to
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile rpm.sh arch.sh puppy.sh ebuild.sh slack.sh
+sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec
+sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec
+sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD
+sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD
+sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs
+sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
+sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
+
+make clean
+make
+
+# change the parent directory name to debian format
+mv ../${APP} ../${DIR}
 
 # Create a source archive
-make clean
-# change the directory name to pybitmessage-version
-mv ../PyBitmessage ../${APP}-${VERSION}
 make source
 
 # Build the package
-dpkg-buildpackage -A
+dpkg-buildpackage -F
-
-# change the directory name back
-mv ../${APP}-${VERSION} ../PyBitmessage
 
+# sign files
 gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb
 gpg -ba ../${APP}_${VERSION}.orig.tar.gz
+
+# restore the parent directory name
+mv ../${DIR} ../${APP}

debian/changelog

@@ -1,3 +1,33 @@
+pybitmessage (0.3.4-1) raring; urgency=low
+
+  * Switched addr, msg, broadcast, and getpubkey message types
+    to 8 byte time. Last remaining type is pubkey.
+  * Added tooltips to show the full subject of messages
+  * Added Maximum Acceptable Difficulty fields in the settings
+  * Send out pubkey immediately after generating deterministic
+    addresses rather than waiting for a request
+
+ -- Bob Mottram (4096 bits) <bob@robotics.uk.to>  Sun, 30 June 2013 11:23:00 +0100
+
+pybitmessage (0.3.3-1) raring; urgency=low
+
+  * Remove inbox item from GUI when using API command trashMessage
+  * Add missing trailing semicolons to pybitmessage.desktop
+  * Ensure $(DESTDIR)/usr/bin exists
+  * Update Makefile to correct sandbox violations when built
+    via Portage (Gentoo)
+  * Fix message authentication bug
+
+ -- Bob Mottram (4096 bits) <bob@robotics.uk.to>  Sat, 29 June 2013 11:23:00 +0100
+
+pybitmessage (0.3.211-1) raring; urgency=low
+
+  * Removed multi-core proof of work
+    as the multiprocessing module does not work well with
+    pyinstaller's --onefile option.
+
+ -- Bob Mottram (4096 bits) <bob@robotics.uk.to>  Fri, 28 June 2013 11:23:00 +0100
+
 pybitmessage (0.3.2-1) raring; urgency=low
 
   * Bugfix: Remove remaining references to the old myapp.trayIcon

debian/compat

@@ -1 +1 @@
-8
+9

debian/control

@@ -1,21 +1,21 @@
 Source: pybitmessage
-Section: contrib/comm
 Priority: extra
-Maintainer: Jonathan Warren <jonathan@bitmessage.org>
+Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
-Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, libmessaging-menu-dev
+Build-Depends: debhelper (>= 9.0.0)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
-Homepage: https://bitmessage.org/
+Homepage: https://github.com/Bitmessage/PyBitmessage
-Vcs-Browser: https://github.com/Bitmessage/PyBitmessage
+Vcs-Git: https://github.com/fuzzgun/fin.git
-Vcs-Git: https://github.com/Bitmessage/PyBitmessage.git
 
 Package: pybitmessage
-Architecture: all
+Section: mail
-Depends: ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, libmessaging-menu-dev
+Architecture: any
-Description: Send encrypted messages to another person or to many subscribers
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev
- Bitmessage is a P2P communications protocol used to send encrypted messages
+Suggests: libmessaging-menu-dev
- to another person or to many subscribers. It is decentralized and trustless,
+Description: Send encrypted messages
- meaning that you need-not inherently trust any entities like root certificate
+ Bitmessage is a P2P communications protocol used to send encrypted
- authorities. It uses strong authentication which means that the sender of a
+ messages to another person or to many subscribers. It is decentralized and
- message cannot be spoofed, and it aims to hide "non-content" data, like the
+ trustless, meaning that you need-not inherently trust any entities like
- sender and receiver of messages, from passive eavesdroppers like those
+ root certificate authorities. It uses strong authentication which means
- running warrantless wiretapping programs.
+ that the sender of a message cannot be spoofed, and it aims to hide
+ "non-content" data, like the sender and receiver of messages, from passive
+ eavesdroppers like those running warrantless wiretapping programs.

debian/copyright

@@ -1,30 +1,30 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: PyBitmessage
+Upstream-Name: 
-Source: https://github.com/Bitmessage/PyBitmessage
+Source: 
 
 Files: *
-Copyright: 2012 Jonathan Warren
+Copyright: Copyright 2013 Bob Mottram (4096 bits) <bob@robotics.uk.to>
 License: MIT
 
 Files: debian/*
-Copyright: 2012 Jonathan Warren
+Copyright: Copyright 2013 Bob Mottram (4096 bits) <bob@robotics.uk.to>
 License: MIT
 
 License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
+ Permission is hereby granted, free of charge, to any person obtaining a
- of this software and associated documentation files (the "Software"), to deal
+ copy of this software and associated documentation files (the "Software"),
- in the Software without restriction, including without limitation the rights
+ to deal in the Software without restriction, including without limitation
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
- copies of the Software, and to permit persons to whom the Software is
+ and/or sell copies of the Software, and to permit persons to whom the
- furnished to do so, subject to the following conditions:
+ Software is furnished to do so, subject to the following conditions:
  .
- The above copyright notice and this permission notice shall be included in
+ The above copyright notice and this permission notice shall be included
- all copies or substantial portions of the Software.
+ in all copies or substantial portions of the Software.
  .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
- THE SOFTWARE.
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

debian/manpages

@@ -0,0 +1 @@
+man/pybitmessage.1.gz

debian/rules

@@ -1,72 +1,42 @@
 #!/usr/bin/make -f
+
 APP=pybitmessage
-
-DEST_MAIN=$(CURDIR)/debian/$(APP)/usr/bin
-DEST_SHARE=$(CURDIR)/debian/$(APP)/usr/share
-DEST_APP=$(DEST_SHARE)/$(APP)
-
 build: build-stamp
 	make
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
-	dh_testdir
+		dh_testdir
-	touch build-stamp
+		touch build-stamp
+
 clean:
-	dh_testdir
+		dh_testdir
-	dh_testroot
+		dh_testroot
-	rm -f build-stamp
+		rm -f build-stamp
-	dh_clean
+		dh_clean
+
 install: build clean
-	dh_testdir
+		 dh_testdir
-	dh_testroot
+		 dh_testroot
-	dh_prep
+		 dh_prep
-	dh_installdirs
+		 dh_installdirs
-
+		 ${MAKE} install -B DESTDIR=${CURDIR}/debian/${APP}
-	mkdir -m 755 -p $(CURDIR)/debian/$(APP)/usr
-	mkdir -m 755 -p $(CURDIR)/debian/$(APP)/usr/bin
-	mkdir -m 755 -p $(DEST_APP)
-	mkdir -m 755 -p $(DEST_SHARE)/applications
-	mkdir -m 755 -p $(DEST_APP)/images
-	mkdir -m 755 -p $(DEST_APP)/pyelliptic
-	mkdir -m 755 -p $(DEST_APP)/socks
-	mkdir -m 755 -p $(DEST_APP)/bitmessageqt
-	mkdir -m 755 -p $(DEST_SHARE)/pixmaps
-	mkdir -m 755 -p $(DEST_SHARE)/icons
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/scalable
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/scalable/apps
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24
-	mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24/apps
-
-	install -m 644 $(CURDIR)/src/*.ui $(DEST_APP)
-	install -m 644 $(CURDIR)/src/*.py $(DEST_APP)
-	install -m 644 $(CURDIR)/src/*.qrc $(DEST_APP)
-
-	install -m 644 $(CURDIR)/src/images/*.png $(DEST_APP)/images
-	install -m 644 $(CURDIR)/src/images/*.ico $(DEST_APP)/images
-	install -m 644 $(CURDIR)/src/pyelliptic/*.py $(DEST_APP)/pyelliptic
-	install -m 644 $(CURDIR)/src/socks/*.py $(DEST_APP)/socks
-	install -m 644 $(CURDIR)/src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt
-	install -m 755 $(CURDIR)/debian/pybm $(DEST_MAIN)/pybitmessage
-
-	install -m 644 $(CURDIR)/desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP).desktop
-	install -m 644 $(CURDIR)/src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png
-	install -m 644 $(CURDIR)/desktop/can-icon.svg $(DEST_SHARE)/icons/hicolor/scalable/apps/$(APP).svg
-	install -m 644 $(CURDIR)/desktop/can-icon.svg $(DEST_SHARE)/pixmaps/$(APP).svg
 binary-indep: build install
-	dh_shlibdeps
+			  dh_testdir
-	dh_testdir
+			  dh_testroot
-	dh_testroot
+			  dh_installchangelogs
-	dh_installchangelogs
+			  dh_installdocs
-	dh_installdocs
+			  dh_installexamples
-#	dh_installexamples
+			  dh_installman
-#	dh_installman
+			  dh_link
-	dh_link
+			  dh_compress
-	dh_compress
+			  dh_fixperms
-	dh_fixperms
+			  dh_installdeb
-	dh_installdeb
+			  dh_gencontrol
-	dh_gencontrol
+			  dh_md5sums
-	dh_md5sums
+			  dh_builddeb
-	dh_builddeb
+
 binary-arch: build install
-binary: binary-indep
+
-.PHONY: build clean binary-indep binary install
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

desktop/icon14.xpm

@@ -0,0 +1,111 @@
+/* XPM */
+static char * icon14_xpm[] = {
+"14 14 94 2",
+"  	c None",
+". 	c #B9BABC",
+"+ 	c #D2D3D4",
+"@ 	c #BEBFC1",
+"# 	c #CBCCCF",
+"$ 	c #E0E3E1",
+"% 	c #F6F8F8",
+"& 	c #F3F3F3",
+"* 	c #B9BABD",
+"= 	c #C8C9CB",
+"- 	c #DADCDB",
+"; 	c #E6E8E7",
+"> 	c #F7F7F7",
+", 	c #FCFCFC",
+"' 	c #F5F5F5",
+") 	c #BCBDBF",
+"! 	c #D3D5D5",
+"~ 	c #E3E5E4",
+"{ 	c #F1F2F2",
+"] 	c #FDFDFD",
+"^ 	c #F8F8F8",
+"/ 	c #CBCCCC",
+"( 	c #B2B3B6",
+"_ 	c #B0B1B3",
+": 	c #D3D4D6",
+"< 	c #DFE0E0",
+"[ 	c #EAEDEB",
+"} 	c #FAF9F9",
+"| 	c #DFE0DF",
+"1 	c #B9BBBD",
+"2 	c #C2C3C5",
+"3 	c #B7B8BC",
+"4 	c #CDCED0",
+"5 	c #DCDDDE",
+"6 	c #E7E9E7",
+"7 	c #F6F6F6",
+"8 	c #C0C1C2",
+"9 	c #DDDFDF",
+"0 	c #BCBCBF",
+"a 	c #D7D9DA",
+"b 	c #E2E4E3",
+"c 	c #F0F2F1",
+"d 	c #FAFAFA",
+"e 	c #F9F9F9",
+"f 	c #CCCDCD",
+"g 	c #B6B7B9",
+"h 	c #C7C8CA",
+"i 	c #A6A7A9",
+"j 	c #D3D4D5",
+"k 	c #F2F5F3",
+"l 	c #F1F2F1",
+"m 	c #F6F8F7",
+"n 	c #FCFBFC",
+"o 	c #E8EAE9",
+"p 	c #B6B7B8",
+"q 	c #BFC0C2",
+"r 	c #323138",
+"s 	c #1D1D22",
+"t 	c #111117",
+"u 	c #4C4C51",
+"v 	c #ECECED",
+"w 	c #FFFFFF",
+"x 	c #BBBDBD",
+"y 	c #C9CACB",
+"z 	c #333238",
+"A 	c #313036",
+"B 	c #27272C",
+"C 	c #1E1F24",
+"D 	c #16171D",
+"E 	c #919193",
+"F 	c #F2F3F3",
+"G 	c #B4B5B7",
+"H 	c #CDCFCF",
+"I 	c #67666B",
+"J 	c #37363C",
+"K 	c #2C2B31",
+"L 	c #2A292F",
+"M 	c #16171C",
+"N 	c #68696B",
+"O 	c #C7C8C9",
+"P 	c #CBCDCC",
+"Q 	c #49474E",
+"R 	c #39383E",
+"S 	c #36353B",
+"T 	c #333138",
+"U 	c #28272D",
+"V 	c #CED0D0",
+"W 	c #67676C",
+"X 	c #414046",
+"Y 	c #424147",
+"Z 	c #39383F",
+"` 	c #8C8D8F",
+" .	c #6B6C70",
+"..	c #75757A",
+"              . +           ",
+"            @ # $ % &       ",
+"          * = - ; > , '     ",
+"          ) ! ~ { ] ^ / (   ",
+"        _ : < [ } , | 1 2   ",
+"      3 4 5 6 7 , { 8 . 9   ",
+"    2 0 a b c d e f g h     ",
+"    i j k l m n o p q h     ",
+"  r s t u v w ' x g y       ",
+"  z A B C D E F G H         ",
+"  I J A K L M N O P         ",
+"    Q R R S T U V           ",
+"      W X Y X Z `           ",
+"             ...            "};

desktop/pybitmessage.desktop

@@ -2,29 +2,8 @@
 Type=Application
 Name=PyBitmessage
 GenericName=PyBitmessage
-X-GNOME-FullName=PyBitmessage Secure Messaging
+Comment=Send encrypted messages
-Comment=Send encrypted messages to another person or to many subscribers
+Exec=pybitmessage %F
-Exec=pybitmessage %U
 Icon=pybitmessage
 Terminal=false
-Categories=Network;Email;Application;
+Categories=Office;Email;
-Keywords=Email;E-mail;Newsgroup;Messaging;
-X-MessagingMenu-UsesChatSection=true
-X-Ubuntu-Gettext-Domain=pybitmessage
-
-Actions=Send;Subscribe;AddressBook;
-
-[Desktop Action Send]
-Name=Send
-Exec=pybitmessage -s
-OnlyShowIn=Unity;
-
-[Desktop Action Subscribe]
-Name=Subscribe
-Exec=pybitmessage -b
-OnlyShowIn=Unity;
-
-[Desktop Action AddressBook]
-Name=Address Book
-Exec=pybitmessage -a
-OnlyShowIn=Unity;

ebuild.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+APP=pybitmessage
+PREV_VERSION=0.3.4
+VERSION=0.3.4
+RELEASE=1
+SOURCEDIR=.
+ARCH_TYPE=`uname -m`
+CURRDIR=`pwd`
+SOURCE=~/ebuild/${APP}-${VERSION}.tar.gz
+
+
+# Update version numbers automatically - so you don't have to
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile debian.sh rpm.sh arch.sh puppy.sh slack.sh
+sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec
+sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec
+sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD
+sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD
+sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs
+sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
+sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
+
+# create the source code in the SOURCES directory
+make clean
+mkdir -p ~/ebuild
+rm -f ${SOURCE}
+mv ../${APP} ../${APP}-${VERSION}
+tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
+
+# rename the root directory without the version number
+mv ../${APP}-${VERSION} ../${APP}
+

ebuildpackage/pybitmessage-0.3.4-1.ebuild

@@ -0,0 +1,22 @@
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs."
+HOMEPAGE="https://github.com/Bitmessage/PyBitmessage"
+SRC_URI="${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86"
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+    econf --with-popt
+}
+
+src_install() {
+    emake DESTDIR="${D}" install
+    # Install README and (Debian) changelog
+    dodoc README.md debian/changelog
+}

generate.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Generates packaging
+
+rm -f Makefile rpmpackage/*.spec
+
+packagemonkey -n "PyBitmessage" --version "0.3.4" --dir "." -l "mit" -e "Bob Mottram (4096 bits) <bob@robotics.uk.to>" --brief "Send encrypted messages" --desc "Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." --homepage "https://github.com/Bitmessage/PyBitmessage" --section "mail" --categories "Office/Email" --dependsdeb "python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev" --dependsrpm "python, PyQt4, openssl-compat-bitcoin-libs" --mainscript "bitmessagemain.py" --librarypath "/opt/openssl-compat-bitcoin/lib/" --suggestsdeb "libmessaging-menu-dev" --dependspuppy "openssl, python-qt4, sqlite3, sqlite3-dev, python-openssl, python-sip" --dependsarch "python2, qt4, python2-pyqt4, sqlite, openssl" --suggestsarch "python2-gevent" --pythonversion 2

puppy.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+APP=pybitmessage
+PREV_VERSION=0.3.4
+VERSION=0.3.4
+RELEASE=1
+BUILDDIR=~/petbuild
+CURRDIR=`pwd`
+PROJECTDIR=${BUILDDIR}/${APP}-${VERSION}-${RELEASE}
+
+# Update version numbers automatically - so you don't have to
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile debian.sh rpm.sh arch.sh ebuild.sh slack.sh
+sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec
+sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec
+sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD
+sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD
+sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs
+sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
+sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
+
+
+# Make directories within which the project will be built
+mkdir -p ${BUILDDIR}
+mkdir -p ${PROJECTDIR}
+
+# Build the project
+make clean
+make
+make install -B DESTDIR=${PROJECTDIR}
+
+# Alter the desktop file categories
+sed -i "s/Categories=Office;Email;/Categories=Internet;mailnews;/g" ${PROJECTDIR}/usr/share/applications/${APP}.desktop
+
+# Create directories specific to puppy
+mkdir ${PROJECTDIR}/usr
+mkdir ${PROJECTDIR}/usr/local
+mkdir ${PROJECTDIR}/usr/local/bin
+
+# Copy anything in /usr/bin into /usr/local/bin
+cp ${PROJECTDIR}/usr/bin/* ${PROJECTDIR}/usr/local/bin/
+
+# Copy the spec file into the build directory
+cp ${CURRDIR}/puppypackage/${APP}-${VERSION}.pet.specs ${PROJECTDIR}
+
+# Copy the XPM mini icon into the build directory
+cp ${CURRDIR}/desktop/icon14.xpm ${PROJECTDIR}/${APP}.xpm
+
+# Compress the build directory
+cd ${BUILDDIR}
+tar -c -f ${APP}-${VERSION}-${RELEASE}.tar .
+sync
+gzip ${APP}-${VERSION}-${RELEASE}.tar
+mv ${APP}-${VERSION}-${RELEASE}.tar.gz ${CURRDIR}/puppypackage
+cd ${CURRDIR}/puppypackage
+
+# Create the PET package
+MD5SUM="`md5sum ${APP}-${VERSION}-${RELEASE}.tar.gz | cut -f 1 -d ' '`"
+echo -n "$MD5SUM" >> ${APP}-${VERSION}-${RELEASE}.tar.gz
+sync
+mv -f ${APP}-${VERSION}-${RELEASE}.tar.gz ${APP}-${VERSION}-${RELEASE}.pet
+sync
+cd ${CURRDIR}
+
+# Remove the temporary build directory
+rm -fr ${BUILDDIR}

puppypackage/icon14.xpm

@@ -0,0 +1,111 @@
+/* XPM */
+static char * icon14_xpm[] = {
+"14 14 94 2",
+"  	c None",
+". 	c #B9BABC",
+"+ 	c #D2D3D4",
+"@ 	c #BEBFC1",
+"# 	c #CBCCCF",
+"$ 	c #E0E3E1",
+"% 	c #F6F8F8",
+"& 	c #F3F3F3",
+"* 	c #B9BABD",
+"= 	c #C8C9CB",
+"- 	c #DADCDB",
+"; 	c #E6E8E7",
+"> 	c #F7F7F7",
+", 	c #FCFCFC",
+"' 	c #F5F5F5",
+") 	c #BCBDBF",
+"! 	c #D3D5D5",
+"~ 	c #E3E5E4",
+"{ 	c #F1F2F2",
+"] 	c #FDFDFD",
+"^ 	c #F8F8F8",
+"/ 	c #CBCCCC",
+"( 	c #B2B3B6",
+"_ 	c #B0B1B3",
+": 	c #D3D4D6",
+"< 	c #DFE0E0",
+"[ 	c #EAEDEB",
+"} 	c #FAF9F9",
+"| 	c #DFE0DF",
+"1 	c #B9BBBD",
+"2 	c #C2C3C5",
+"3 	c #B7B8BC",
+"4 	c #CDCED0",
+"5 	c #DCDDDE",
+"6 	c #E7E9E7",
+"7 	c #F6F6F6",
+"8 	c #C0C1C2",
+"9 	c #DDDFDF",
+"0 	c #BCBCBF",
+"a 	c #D7D9DA",
+"b 	c #E2E4E3",
+"c 	c #F0F2F1",
+"d 	c #FAFAFA",
+"e 	c #F9F9F9",
+"f 	c #CCCDCD",
+"g 	c #B6B7B9",
+"h 	c #C7C8CA",
+"i 	c #A6A7A9",
+"j 	c #D3D4D5",
+"k 	c #F2F5F3",
+"l 	c #F1F2F1",
+"m 	c #F6F8F7",
+"n 	c #FCFBFC",
+"o 	c #E8EAE9",
+"p 	c #B6B7B8",
+"q 	c #BFC0C2",
+"r 	c #323138",
+"s 	c #1D1D22",
+"t 	c #111117",
+"u 	c #4C4C51",
+"v 	c #ECECED",
+"w 	c #FFFFFF",
+"x 	c #BBBDBD",
+"y 	c #C9CACB",
+"z 	c #333238",
+"A 	c #313036",
+"B 	c #27272C",
+"C 	c #1E1F24",
+"D 	c #16171D",
+"E 	c #919193",
+"F 	c #F2F3F3",
+"G 	c #B4B5B7",
+"H 	c #CDCFCF",
+"I 	c #67666B",
+"J 	c #37363C",
+"K 	c #2C2B31",
+"L 	c #2A292F",
+"M 	c #16171C",
+"N 	c #68696B",
+"O 	c #C7C8C9",
+"P 	c #CBCDCC",
+"Q 	c #49474E",
+"R 	c #39383E",
+"S 	c #36353B",
+"T 	c #333138",
+"U 	c #28272D",
+"V 	c #CED0D0",
+"W 	c #67676C",
+"X 	c #414046",
+"Y 	c #424147",
+"Z 	c #39383F",
+"` 	c #8C8D8F",
+" .	c #6B6C70",
+"..	c #75757A",
+"              . +           ",
+"            @ # $ % &       ",
+"          * = - ; > , '     ",
+"          ) ! ~ { ] ^ / (   ",
+"        _ : < [ } , | 1 2   ",
+"      3 4 5 6 7 , { 8 . 9   ",
+"    2 0 a b c d e f g h     ",
+"    i j k l m n o p q h     ",
+"  r s t u v w ' x g y       ",
+"  z A B C D E F G H         ",
+"  I J A K L M N O P         ",
+"    Q R R S T U V           ",
+"      W X Y X Z `           ",
+"             ...            "};

puppypackage/pybitmessage-0.3.4.pet.specs

@@ -0,0 +1 @@
+pybitmessage-0.3.4-1|PyBitmessage|0.3.4|1|Internet;mailnews;|5.1M||pybitmessage-0.3.4-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip|Send encrypted messages|ubuntu|precise|5|

rpm.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+APP=pybitmessage
+PREV_VERSION=0.3.4
+VERSION=0.3.4
+RELEASE=1
+SOURCEDIR=.
+ARCH_TYPE=`uname -m`
+CURRDIR=`pwd`
+SOURCE=~/rpmbuild/SOURCES/${APP}_${VERSION}.orig.tar.gz
+
+
+# Update version numbers automatically - so you don't have to
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile debian.sh arch.sh puppy.sh ebuild.sh slack.sh
+sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec
+sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec
+sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD
+sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD
+sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs
+sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
+sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
+
+sudo yum groupinstall "Development Tools"
+sudo yum install rpmdevtools
+
+# setup the rpmbuild directory tree
+rpmdev-setuptree
+
+# create the source code in the SOURCES directory
+make clean
+mkdir -p ~/rpmbuild/SOURCES
+rm -f ${SOURCE}
+
+# having the root directory called name-version seems essential
+mv ../${APP} ../${APP}-${VERSION}
+tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
+
+# rename the root directory without the version number
+mv ../${APP}-${VERSION} ../${APP}
+
+# copy the spec file into the SPECS directory
+cp -f rpmpackage/${APP}.spec ~/rpmbuild/SPECS
+
+# build
+cd ~/rpmbuild/SPECS
+rpmbuild -ba ${APP}.spec
+cd ${CURRDIR}
+
+# Copy the results into the rpmpackage directory
+mkdir -p rpmpackage/${ARCH_TYPE}
+cp -r ~/rpmbuild/RPMS/${ARCH_TYPE}/${APP}* rpmpackage/${ARCH_TYPE}
+cp -r ~/rpmbuild/SRPMS/${APP}* rpmpackage

rpmpackage/pybitmessage.spec

@@ -0,0 +1,207 @@
+Name: pybitmessage
+Version: 0.3.4
+Release: 1%{?dist}
+Summary: Send encrypted messages
+License: MIT
+URL: https://github.com/Bitmessage/PyBitmessage
+Packager: Bob Mottram (4096 bits) <bob@robotics.uk.to>
+Source0: http://yourdomainname.com/src/%{name}_%{version}.orig.tar.gz
+Group: Office/Email
+
+Requires: python, PyQt4, openssl-compat-bitcoin-libs
+
+
+%description
+Bitmessage is a P2P communications protocol used to send encrypted messages
+to another person or to many subscribers. It is decentralized and
+trustless, meaning that you need-not inherently trust any entities like
+root certificate authorities. It uses strong authentication which means
+that the sender of a message cannot be spoofed, and it aims to hide
+"non-content" data, like the sender and receiver of messages, from passive
+eavesdroppers like those running warrantless wiretapping programs.
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}
+mkdir -p %{buildroot}/etc
+mkdir -p %{buildroot}/etc/%{name}
+mkdir -p %{buildroot}/usr
+mkdir -p %{buildroot}/usr/bin
+mkdir -p %{buildroot}/usr/share
+mkdir -p %{buildroot}/usr/share/man
+mkdir -p %{buildroot}/usr/share/man/man1
+mkdir -p %{buildroot}/usr/share/%{name}
+mkdir -p %{buildroot}/usr/share/applications
+mkdir -p %{buildroot}/usr/share/icons
+mkdir -p %{buildroot}/usr/share/icons/hicolor
+mkdir -p %{buildroot}/usr/share/icons/hicolor/24x24
+mkdir -p %{buildroot}/usr/share/icons/hicolor/24x24/apps
+
+mkdir -p %{buildroot}/usr/share/pixmaps
+mkdir -p %{buildroot}/usr/share/icons/hicolor/scalable
+mkdir -p %{buildroot}/usr/share/icons/hicolor/scalable/apps
+# Make install but to the RPM BUILDROOT directory
+make install -B DESTDIR=%{buildroot}
+
+%files
+%doc README.md LICENSE
+%defattr(-,root,root,-)
+%dir /usr/share/%{name}
+%dir /usr/share/applications
+%dir /usr/share/icons/hicolor
+%dir /usr/share/icons/hicolor/24x24
+%dir /usr/share/icons/hicolor/24x24/apps
+%dir /usr/share/pixmaps
+%dir /usr/share/icons/hicolor/scalable
+%dir /usr/share/icons/hicolor/scalable/apps
+/usr/share/%{name}/*
+%{_bindir}/*
+%{_mandir}/man1/*
+%attr(644,root,root) /usr/share/applications/%{name}.desktop
+%attr(644,root,root) /usr/share/icons/hicolor/24x24/apps/%{name}.png
+
+%changelog
+* Sun Jun 30 2013 Bob Mottram (4096 bits) <bob@robotics.uk.to> - 0.3.4-1
+- Switched addr, msg, broadcast, and getpubkey message types
+  to 8 byte time. Last remaining type is pubkey.
+- Added tooltips to show the full subject of messages
+- Added Maximum Acceptable Difficulty fields in the settings
+- Send out pubkey immediately after generating deterministic
+  addresses rather than waiting for a request
+
+* Sat Jun 29 2013 Bob Mottram (4096 bits) <bob@robotics.uk.to> - 0.3.3-1
+- Remove inbox item from GUI when using API command trashMessage
+- Add missing trailing semicolons to pybitmessage.desktop
+- Ensure $(DESTDIR)/usr/bin exists
+- Update Makefile to correct sandbox violations when built
+  via Portage (Gentoo)
+- Fix message authentication bug
+
+* Fri Jun 28 2013 Bob Mottram (4096 bits) <bob@robotics.uk.to> - 0.3.211-1
+- Removed multi-core proof of work
+  as the multiprocessing module does not work well with
+  pyinstaller's --onefile option.
+
+* Mon Jun 03 2013 Bob Mottram (4096 bits) <bob@robotics.uk.to> - 0.3.2-1
+- Bugfix: Remove remaining references to the old myapp.trayIcon
+- Refactored message status-related code. API function getStatus
+  now returns one of these strings: notfound, msgqueued,
+  broadcastqueued, broadcastsent, doingpubkeypow, awaitingpubkey,
+  doingmsgpow, msgsent, or ackreceived
+- Moved proof of work to low-priority multi-threaded child
+  processes
+- Added menu option to delete all trashed messages
+- Added inv flooding attack mitigation
+- On Linux, when selecting Show Bitmessage, do not maximize
+  automatically
+- Store tray icons in bitmessage_icons_rc.py
+
+* Sat May 25 2013 Jonathan Warren (4096 bits) <jonathan@bitmessage.org> - 0.3.1-1
+- Added new API commands: getDeterministicAddress,
+  addSubscription, deleteSubscription
+- TCP Connection timeout for non-fully-established connections
+  now 20 seconds
+- Don't update the time we last communicated with a node unless
+  the connection is fully established. This will allow us to
+  forget about active but non-Bitmessage nodes which have made
+  it into our knownNodes file.
+- Prevent incoming connection flooding from crashing
+  singleListener thread. Client will now only accept one
+  connection per remote node IP
+- Bugfix: Worker thread crashed when doing a POW to send out
+  a v2 pubkey (bug introduced in 0.3.0)
+- Wrap all sock.shutdown functions in error handlers
+- Put all 'commit' commands within SQLLocks
+- Bugfix: If address book label is blank, Bitmessage wouldn't
+  show message (bug introduced in 0.3.0)
+- Messaging menu item selects the oldest unread message
+- Standardize on 'Quit' rather than 'Exit'
+- [OSX] Try to seek homebrew installation of OpenSSL
+- Prevent multiple instances of the application from running
+- Show 'Connected' or 'Connection Lost' indicators
+- Use only 9 half-open connections on Windows but 32 for
+  everyone else
+- Added appIndicator (a more functional tray icon) and Ubuntu
+  Messaging Menu integration
+- Changed Debian install directory and run script name based
+  on Github issue #135
+
+* Tue May 6 2013 Bob Mottram (4096 bits) <bob@sluggish.dyndns.org> - 0.3.0-1
+- Added new API function: getStatus
+- Added error-handling around all sock.sendall() functions
+  in the receiveData thread so that if there is a problem
+  sending data, the threads will close gracefully
+- Abandoned and removed the connectionsCount data structure;
+  use the connectedHostsList instead because it has proved to be
+  more accurate than trying to maintain the connectionsCount
+- Added daemon mode. All UI code moved into a module and many
+  shared objects moved into shared.py
+- Truncate display of very long messages to avoid freezing the UI
+- Added encrypted broadcasts for v3 addresses or v2 addresses
+  after 2013-05-28 10:00 UTC
+- No longer self.sock.close() from within receiveDataThreads,
+  let the sendDataThreads do it
+- Swapped out the v2 announcements subscription address for a v3
+  announcements subscription address
+- Vacuum the messages.dat file once a month: will greatly reduce the file size
+- Added a settings table in message.dat
+- Implemented v3 addresses:
+  pubkey messages must now include two var_ints: nonce_trials_per_byte
+  and extra_bytes, and also be signed. When sending a message to a v3
+  address, the sender must use these values in calculating its POW or
+  else the message will not be accepted by the receiver.
+- Display a privacy warning when selecting 'Send Broadcast from this address'
+- Added gitignore file
+- Added code in preparation for a switch from 32-bit time to 64-bit time.
+  Nodes will now advertise themselves as using protocol version 2.
+- Don't necessarily delete entries from the inventory after 2.5 days;
+  leave pubkeys there for 28 days so that we don't process the same ones
+  many times throughout a month. This was causing the 'pubkeys processed'
+  indicator on the 'Network Status' tab to not accurately reflect the
+  number of truly new addresses on the network.
+- Use 32 threads for outgoing connections in order to connect quickly
+- Fix typo when calling os.environ in the sys.platform=='darwin' case
+- Allow the cancelling of a message which is in the process of being
+  sent by trashing it then restarting Bitmessage
+- Bug fix: can't delete address from address book
+
+* Tue Apr 9 2013 Bob Mottram (4096 bits) <bob@sluggish.dyndns.org> - 0.2.8-1
+- Fixed Ubuntu & OS X issue:
+  Bitmessage wouldn't receive any objects from peers after restart.
+- Inventory flush to disk when exiting program now vastly faster.
+- Fixed address generation bug (kept Bitmessage from restarting).
+- Improve deserialization of messages
+  before processing (a 'best practice').
+- Change to help Macs find OpenSSL the way Unix systems find it.
+- Do not share or accept IPs which are in the private IP ranges.
+- Added time-fuzzing
+  to the embedded time in pubkey and getpubkey messages.
+- Added a knownNodes lock
+  to prevent an exception from sometimes occurring when saving
+  the data-structure to disk.
+- Show unread messages in bold
+  and do not display new messages automatically.
+- Support selecting multiple items
+  in the inbox, sent box, and address book.
+- Use delete key to trash Inbox or Sent messages.
+- Display richtext(HTML) messages
+  from senders in address book or subscriptions (although not
+  pseudo-mailing-lists; use new right-click option).
+- Trim spaces
+  from the beginning and end of addresses when adding to
+  address book, subscriptions, and blacklist.
+- Improved the display of the time for foreign language users.
+
+* Tue Apr 1 2013 Bob Mottram (4096 bits) <bob@sluggish.dyndns.org> - 0.2.7-1
+- Added debian packaging
+- Script to generate debian packages
+- SVG icon for Gnome shell, etc
+- Source moved int src directory for debian standards compatibility
+- Trailing carriage return on COPYING LICENSE and README.md

slack.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+APP=pybitmessage
+PREV_VERSION=0.3.4
+VERSION=0.3.4
+RELEASE=1
+ARCH_TYPE=`uname -m`
+BUILDDIR=~/slackbuild
+CURRDIR=`pwd`
+PROJECTDIR=${BUILDDIR}/${APP}-${VERSION}-${RELEASE}
+
+# Update version numbers automatically - so you don't have to
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile debian.sh rpm.sh arch.sh puppy.sh ebuild.sh
+sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec
+sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec
+sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD
+sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD
+sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs
+sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
+sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
+
+
+# Make directories within which the project will be built
+mkdir -p ${BUILDDIR}
+mkdir -p ${PROJECTDIR}
+
+# Build the project
+make clean
+make
+make install -B DESTDIR=${PROJECTDIR}
+
+# Copy the slack-desc and doinst.sh files into the build install directory
+mkdir ${PROJECTDIR}/install
+cp ${CURRDIR}/slackpackage/slack-desc ${PROJECTDIR}/install
+cp ${CURRDIR}/slackpackage/doinst.sh ${PROJECTDIR}/install
+
+# Compress the build directory
+cd ${BUILDDIR}
+tar -c -f ${APP}-${VERSION}-${RELEASE}.tar .
+sync
+xz ${APP}-${VERSION}-${RELEASE}.tar
+sync
+mv ${APP}-${VERSION}-${RELEASE}.tar.xz ${CURRDIR}/slackpackage/${APP}-${VERSION}-${ARCH_TYPE}-${RELEASE}.txz
+cd ${CURRDIR}
+
+# Remove the temporary build directory
+rm -fr ${BUILDDIR}

slackpackage/doinst.sh

@@ -0,0 +1,4 @@
+#!/bin/sh -e
+
+# This script is run after installation.
+# Any additional configuration goes here.

slackpackage/slack-desc

@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+            |-----handy-ruler--------------------------------------------------|
+pybitmessage: pybitmessage (Send encrypted messages)
+pybitmessage:
+pybitmessage: Bitmessage is a P2P communications protocol used to send
+pybitmessage: encrypted messages to another person or to many subscribers. It
+pybitmessage: is decentralized and trustless, meaning that you need-not
+pybitmessage: inherently trust any entities like root certificate authorities.
+pybitmessage: It uses strong authentication which means that the sender of a
+pybitmessage: message cannot be spoofed, and it aims to hide "non-content"
+pybitmessage: data, like the sender and receiver of messages, from passive
+pybitmessage: eavesdroppers like those running warrantless wiretapping
+pybitmessage: programs.

src/bitmessagemain.py

@@ -8,2559 +8,38 @@
 # yet contain logic to expand into further streams.
 
 # The software version variable is now held in shared.py
-verbose = 1
-maximumAgeOfAnObjectThatIAmWillingToAccept = 216000  # Equals two days and 12 hours.
-lengthOfTimeToLeaveObjectsInInventory = 237600  # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.
-lengthOfTimeToHoldOnToAllPubkeys = 2419200  # Equals 4 weeks. You could make this longer if you want but making it shorter would not be advisable because there is a very small possibility that it could keep you from obtaining a needed pubkey for a period of time.
-maximumAgeOfObjectsThatIAdvertiseToOthers = 216000  # Equals two days and 12 hours
-maximumAgeOfNodesThatIAdvertiseToOthers = 10800  # Equals three hours
-storeConfigFilesInSameDirectoryAsProgramByDefault = False  # The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder.
-useVeryEasyProofOfWorkForTesting = False  # If you set this to True while on the normal network, you won't be able to send or sometimes receive messages.
-encryptedBroadcastSwitchoverTime = 1369735200
 
-import sys
+#import ctypes
-import ConfigParser
+try:
-import Queue
+    from gevent import monkey
-from addresses import *
+    monkey.patch_all()
-import shared
+except ImportError as ex:
-from defaultKnownNodes import *
+    print "Not using the gevent module as it was not found. No need to worry."
-import time
+
-import socket
-import threading
-import hashlib
-from struct import *
-import pickle
-import random
-import sqlite3
-from time import strftime, localtime, gmtime
-import shutil  # used for moving the messages.dat file
-import string
-import socks
-import highlevelcrypto
-from pyelliptic.openssl import OpenSSL
-import ctypes
-from pyelliptic import arithmetic
 import signal  # Used to capture a Ctrl-C keypress so that Bitmessage can shutdown gracefully.
 # The next 3 are used for the API
 from SimpleXMLRPCServer import *
 import json
-from subprocess import call  # used when the API must execute an outside program
 import singleton
-import proofofwork
+import os
-
+
-# For each stream to which we connect, several outgoingSynSender threads
+# Classes
-# will exist and will collectively create 8 connections with peers.
+from class_sqlThread import *
-
+from class_singleCleaner import *
-class outgoingSynSender(threading.Thread):
+from class_singleWorker import *
-
+from class_outgoingSynSender import *
-    def __init__(self):
+from class_singleListener import *
-        threading.Thread.__init__(self)
+from class_addressGenerator import *
-
+
-    def setup(self, streamNumber):
+# Helper Functions
-        self.streamNumber = streamNumber
+import helper_bootstrap
-
+
-    def run(self):
+import sys
-        time.sleep(1)
+if sys.platform == 'darwin':
-        global alreadyAttemptedConnectionsListResetTime
+    if float( "{1}.{2}".format(*sys.version_info) ) < 7.5:
-        while True:
+        print "You should use python 2.7.5 or greater."
-            while len(selfInitiatedConnections[self.streamNumber]) >= 8:  # maximum number of outgoing connections = 8
+        print "Your version: {0}.{1}.{2}".format(*sys.version_info)
-                time.sleep(10)
-            if shared.shutdown:
-                break
-            random.seed()
-            HOST, = random.sample(shared.knownNodes[self.streamNumber], 1)
-            alreadyAttemptedConnectionsListLock.acquire()
-            while HOST in alreadyAttemptedConnectionsList or HOST in shared.connectedHostsList:
-                alreadyAttemptedConnectionsListLock.release()
-                # print 'choosing new sample'
-                random.seed()
-                HOST, = random.sample(shared.knownNodes[
-                                      self.streamNumber], 1)
-                time.sleep(1)
-                # Clear out the alreadyAttemptedConnectionsList every half
-                # hour so that this program will again attempt a connection
-                # to any nodes, even ones it has already tried.
-                if (time.time() - alreadyAttemptedConnectionsListResetTime) > 1800:
-                    alreadyAttemptedConnectionsList.clear()
-                    alreadyAttemptedConnectionsListResetTime = int(
-                        time.time())
-                alreadyAttemptedConnectionsListLock.acquire()
-            alreadyAttemptedConnectionsList[HOST] = 0
-            alreadyAttemptedConnectionsListLock.release()
-            PORT, timeNodeLastSeen = shared.knownNodes[
-                self.streamNumber][HOST]
-            sock = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM)
-            # This option apparently avoids the TIME_WAIT state so that we
-            # can rebind faster
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            sock.settimeout(20)
-            if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and verbose >= 2:
-                shared.printLock.acquire()
-                print 'Trying an outgoing connection to', HOST, ':', PORT
-                shared.printLock.release()
-                # sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS4a':
-                if verbose >= 2:
-                    shared.printLock.acquire()
-                    print '(Using SOCKS4a) Trying an outgoing connection to', HOST, ':', PORT
-                    shared.printLock.release()
-                proxytype = socks.PROXY_TYPE_SOCKS4
-                sockshostname = shared.config.get(
-                    'bitmessagesettings', 'sockshostname')
-                socksport = shared.config.getint(
-                    'bitmessagesettings', 'socksport')
-                rdns = True  # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway.
-                if shared.config.getboolean('bitmessagesettings', 'socksauthentication'):
-                    socksusername = shared.config.get(
-                        'bitmessagesettings', 'socksusername')
-                    sockspassword = shared.config.get(
-                        'bitmessagesettings', 'sockspassword')
-                    sock.setproxy(
-                        proxytype, sockshostname, socksport, rdns, socksusername, sockspassword)
-                else:
-                    sock.setproxy(
-                        proxytype, sockshostname, socksport, rdns)
-            elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS5':
-                if verbose >= 2:
-                    shared.printLock.acquire()
-                    print '(Using SOCKS5) Trying an outgoing connection to', HOST, ':', PORT
-                    shared.printLock.release()
-                proxytype = socks.PROXY_TYPE_SOCKS5
-                sockshostname = shared.config.get(
-                    'bitmessagesettings', 'sockshostname')
-                socksport = shared.config.getint(
-                    'bitmessagesettings', 'socksport')
-                rdns = True  # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway.
-                if shared.config.getboolean('bitmessagesettings', 'socksauthentication'):
-                    socksusername = shared.config.get(
-                        'bitmessagesettings', 'socksusername')
-                    sockspassword = shared.config.get(
-                        'bitmessagesettings', 'sockspassword')
-                    sock.setproxy(
-                        proxytype, sockshostname, socksport, rdns, socksusername, sockspassword)
-                else:
-                    sock.setproxy(
-                        proxytype, sockshostname, socksport, rdns)
-
-            try:
-                sock.connect((HOST, PORT))
-                rd = receiveDataThread()
-                rd.daemon = True  # close the main program even if there are threads left
-                objectsOfWhichThisRemoteNodeIsAlreadyAware = {}
-                rd.setup(sock, HOST, PORT, self.streamNumber,
-                         objectsOfWhichThisRemoteNodeIsAlreadyAware)
-                rd.start()
-                shared.printLock.acquire()
-                print self, 'connected to', HOST, 'during an outgoing attempt.'
-                shared.printLock.release()
-
-                sd = sendDataThread()
-                sd.setup(sock, HOST, PORT, self.streamNumber,
-                         objectsOfWhichThisRemoteNodeIsAlreadyAware)
-                sd.start()
-                sd.sendVersionMessage()
-
-            except socks.GeneralProxyError as err:
-                if verbose >= 2:
-                    shared.printLock.acquire()
-                    print 'Could NOT connect to', HOST, 'during outgoing attempt.', err
-                    shared.printLock.release()
-                PORT, timeLastSeen = shared.knownNodes[
-                    self.streamNumber][HOST]
-                if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000:  # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the shared.knownNodes data-structure.
-                    shared.knownNodesLock.acquire()
-                    del shared.knownNodes[self.streamNumber][HOST]
-                    shared.knownNodesLock.release()
-                    shared.printLock.acquire()
-                    print 'deleting ', HOST, 'from shared.knownNodes because it is more than 48 hours old and we could not connect to it.'
-                    shared.printLock.release()
-            except socks.Socks5AuthError as err:
-                shared.UISignalQueue.put((
-                    'updateStatusBar', _translate(
-                    "MainWindow", "SOCKS5 Authentication problem: %1").arg(str(err))))
-            except socks.Socks5Error as err:
-                pass
-                print 'SOCKS5 error. (It is possible that the server wants authentication).)', str(err)
-            except socks.Socks4Error as err:
-                print 'Socks4Error:', err
-            except socket.error as err:
-                if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS':
-                    print 'Bitmessage MIGHT be having trouble connecting to the SOCKS server. ' + str(err)
-                else:
-                    if verbose >= 1:
-                        shared.printLock.acquire()
-                        print 'Could NOT connect to', HOST, 'during outgoing attempt.', err
-                        shared.printLock.release()
-                    PORT, timeLastSeen = shared.knownNodes[
-                        self.streamNumber][HOST]
-                    if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000:  # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the knownNodes data-structure.
-                        shared.knownNodesLock.acquire()
-                        del shared.knownNodes[self.streamNumber][HOST]
-                        shared.knownNodesLock.release()
-                        shared.printLock.acquire()
-                        print 'deleting ', HOST, 'from knownNodes because it is more than 48 hours old and we could not connect to it.'
-                        shared.printLock.release()
-            except Exception as err:
-                sys.stderr.write(
-                    'An exception has occurred in the outgoingSynSender thread that was not caught by other exception types: %s\n' % err)
-            time.sleep(0.1)
-
-# Only one singleListener thread will ever exist. It creates the
-# receiveDataThread and sendDataThread for each incoming connection. Note
-# that it cannot set the stream number because it is not known yet- the
-# other node will have to tell us its stream number in a version message.
-# If we don't care about their stream, we will close the connection
-# (within the recversion function of the recieveData thread)
-
-
-class singleListener(threading.Thread):
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-
-    def run(self):
-        # We don't want to accept incoming connections if the user is using a
-        # SOCKS proxy. If they eventually select proxy 'none' then this will
-        # start listening for connections.
-        while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS':
-            time.sleep(300)
-
-        shared.printLock.acquire()
-        print 'Listening for incoming connections.'
-        shared.printLock.release()
-        HOST = ''  # Symbolic name meaning all available interfaces
-        PORT = shared.config.getint('bitmessagesettings', 'port')
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        # This option apparently avoids the TIME_WAIT state so that we can
-        # rebind faster
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        sock.bind((HOST, PORT))
-        sock.listen(2)
-
-        while True:
-            # We don't want to accept incoming connections if the user is using
-            # a SOCKS proxy. If the user eventually select proxy 'none' then
-            # this will start listening for connections.
-            while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS':
-                time.sleep(10)
-            while len(shared.connectedHostsList) > 220:
-                shared.printLock.acquire()
-                print 'We are connected to too many people. Not accepting further incoming connections for ten seconds.'
-                shared.printLock.release()
-                time.sleep(10)
-            a, (HOST, PORT) = sock.accept()
-
-            # The following code will, unfortunately, block an incoming
-            # connection if someone else on the same LAN is already connected
-            # because the two computers will share the same external IP. This
-            # is here to prevent connection flooding.
-            while HOST in shared.connectedHostsList:
-                shared.printLock.acquire()
-                print 'We are already connected to', HOST + '. Ignoring connection.'
-                shared.printLock.release()
-                a.close()
-                a, (HOST, PORT) = sock.accept()
-            objectsOfWhichThisRemoteNodeIsAlreadyAware = {}
-            a.settimeout(20)
-
-            sd = sendDataThread()
-            sd.setup(
-                a, HOST, PORT, -1, objectsOfWhichThisRemoteNodeIsAlreadyAware)
-            sd.start()
-
-            rd = receiveDataThread()
-            rd.daemon = True  # close the main program even if there are threads left
-            rd.setup(
-                a, HOST, PORT, -1, objectsOfWhichThisRemoteNodeIsAlreadyAware)
-            rd.start()
-
-            shared.printLock.acquire()
-            print self, 'connected to', HOST, 'during INCOMING request.'
-            shared.printLock.release()
-
-# This thread is created either by the synSenderThread(for outgoing
-# connections) or the singleListenerThread(for incoming connectiosn).
-
-
-class receiveDataThread(threading.Thread):
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self.data = ''
-        self.verackSent = False
-        self.verackReceived = False
-
-    def setup(
-        self,
-        sock,
-        HOST,
-        port,
-        streamNumber,
-            objectsOfWhichThisRemoteNodeIsAlreadyAware):
-        self.sock = sock
-        self.HOST = HOST
-        self.PORT = port
-        self.streamNumber = streamNumber
-        self.payloadLength = 0  # This is the protocol payload length thus it doesn't include the 24 byte message header
-        self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = {}
-        shared.connectedHostsList[
-            self.HOST] = 0  # The very fact that this receiveData thread exists shows that we are connected to the remote host. Let's add it to this list so that an outgoingSynSender thread doesn't try to connect to it.
-        self.connectionIsOrWasFullyEstablished = False  # set to true after the remote node and I accept each other's version messages. This is needed to allow the user interface to accurately reflect the current number of connections.
-        if self.streamNumber == -1:  # This was an incoming connection. Send out a version message if we accept the other node's version message.
-            self.initiatedConnection = False
-        else:
-            self.initiatedConnection = True
-            selfInitiatedConnections[streamNumber][self] = 0
-        self.ackDataThatWeHaveYetToSend = [
-        ]  # When we receive a message bound for us, we store the acknowledgement that we need to send (the ackdata) here until we are done processing all other data received from this peer.
-        self.objectsOfWhichThisRemoteNodeIsAlreadyAware = objectsOfWhichThisRemoteNodeIsAlreadyAware
-
-    def run(self):
-        shared.printLock.acquire()
-        print 'ID of the receiveDataThread is', str(id(self)) + '. The size of the shared.connectedHostsList is now', len(shared.connectedHostsList)
-        shared.printLock.release()
-        while True:
-            try:
-                self.data += self.sock.recv(4096)
-            except socket.timeout:
-                shared.printLock.acquire()
-                print 'Timeout occurred waiting for data from', self.HOST + '. Closing receiveData thread. (ID:', str(id(self)) + ')'
-                shared.printLock.release()
-                break
-            except Exception as err:
-                shared.printLock.acquire()
-                print 'sock.recv error. Closing receiveData thread (HOST:', self.HOST, 'ID:', str(id(self)) + ').', err
-                shared.printLock.release()
-                break
-            # print 'Received', repr(self.data)
-            if self.data == "":
-                shared.printLock.acquire()
-                print 'Connection to', self.HOST, 'closed. Closing receiveData thread. (ID:', str(id(self)) + ')'
-                shared.printLock.release()
-                break
-            else:
-                self.processData()
-
-        try:
-            del selfInitiatedConnections[self.streamNumber][self]
-            shared.printLock.acquire()
-            print 'removed self (a receiveDataThread) from selfInitiatedConnections'
-            shared.printLock.release()
-        except:
-            pass
-        shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
-        try:
-            del shared.connectedHostsList[self.HOST]
-        except Exception as err:
-            shared.printLock.acquire()
-            print 'Could not delete', self.HOST, 'from shared.connectedHostsList.', err
-            shared.printLock.release()
-        try:
-            del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[
-                self.HOST]
-        except:
-            pass
-        shared.UISignalQueue.put(('updateNetworkStatusTab', 'no data'))
-        shared.printLock.acquire()
-        print 'The size of the connectedHostsList is now:', len(shared.connectedHostsList)
-        shared.printLock.release()
-
-    def processData(self):
-        global verbose
-        # if verbose >= 3:
-            # shared.printLock.acquire()
-            # print 'self.data is currently ', repr(self.data)
-            # shared.printLock.release()
-        if len(self.data) < 20:  # if so little of the data has arrived that we can't even unpack the payload length
-            return
-        if self.data[0:4] != '\xe9\xbe\xb4\xd9':
-            if verbose >= 1:
-                shared.printLock.acquire()
-                print 'The magic bytes were not correct. First 40 bytes of data: ' + repr(self.data[0:40])
-                shared.printLock.release()
-            self.data = ""
-            return
-        self.payloadLength, = unpack('>L', self.data[16:20])
-        if len(self.data) < self.payloadLength + 24:  # check if the whole message has arrived yet.
-            return
-        if self.data[20:24] != hashlib.sha512(self.data[24:self.payloadLength + 24]).digest()[0:4]:  # test the checksum in the message. If it is correct...
-            print 'Checksum incorrect. Clearing this message.'
-            self.data = self.data[self.payloadLength + 24:]
-            self.processData()
-            return
-        # The time we've last seen this node is obviously right now since we
-        # just received valid data from it. So update the knownNodes list so
-        # that other peers can be made aware of its existance.
-        if self.initiatedConnection and self.connectionIsOrWasFullyEstablished:  # The remote port is only something we should share with others if it is the remote node's incoming port (rather than some random operating-system-assigned outgoing port).
-            shared.knownNodesLock.acquire()
-            shared.knownNodes[self.streamNumber][
-                self.HOST] = (self.PORT, int(time.time()))
-            shared.knownNodesLock.release()
-        if self.payloadLength <= 180000000:  # If the size of the message is greater than 180MB, ignore it. (I get memory errors when processing messages much larger than this though it is concievable that this value will have to be lowered if some systems are less tolarant of large messages.)
-            remoteCommand = self.data[4:16]
-            shared.printLock.acquire()
-            print 'remoteCommand', repr(remoteCommand.replace('\x00', '')), ' from', self.HOST
-            shared.printLock.release()
-            if remoteCommand == 'version\x00\x00\x00\x00\x00':
-                self.recversion(self.data[24:self.payloadLength + 24])
-            elif remoteCommand == 'verack\x00\x00\x00\x00\x00\x00':
-                self.recverack()
-            elif remoteCommand == 'addr\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                self.recaddr(self.data[24:self.payloadLength + 24])
-            elif remoteCommand == 'getpubkey\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                self.recgetpubkey(self.data[24:self.payloadLength + 24])
-            elif remoteCommand == 'pubkey\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                self.recpubkey(self.data[24:self.payloadLength + 24])
-            elif remoteCommand == 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                self.recinv(self.data[24:self.payloadLength + 24])
-            elif remoteCommand == 'getdata\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                self.recgetdata(self.data[24:self.payloadLength + 24])
-            elif remoteCommand == 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                self.recmsg(self.data[24:self.payloadLength + 24])
-            elif remoteCommand == 'broadcast\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                self.recbroadcast(self.data[24:self.payloadLength + 24])
-            elif remoteCommand == 'ping\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                self.sendpong()
-            elif remoteCommand == 'pong\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                pass
-            elif remoteCommand == 'alert\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                pass
-
-        self.data = self.data[
-            self.payloadLength + 24:]  # take this message out and then process the next message
-        if self.data == '':
-            while len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 0:
-                random.seed()
-                objectHash, = random.sample(
-                    self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 1)
-                if objectHash in shared.inventory:
-                    shared.printLock.acquire()
-                    print 'Inventory (in memory) already has object listed in inv message.'
-                    shared.printLock.release()
-                    del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[
-                        objectHash]
-                elif isInSqlInventory(objectHash):
-                    if verbose >= 3:
-                        shared.printLock.acquire()
-                        print 'Inventory (SQL on disk) already has object listed in inv message.'
-                        shared.printLock.release()
-                    del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[
-                        objectHash]
-                else:
-                    self.sendgetdata(objectHash)
-                    del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[
-                        objectHash]  # It is possible that the remote node doesn't respond with the object. In that case, we'll very likely get it from someone else anyway.
-                    if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) == 0:
-                        shared.printLock.acquire()
-                        print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)
-                        shared.printLock.release()
-                        try:
-                            del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[
-                                self.HOST]  # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together.
-                        except:
-                            pass
-                    break
-                if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) == 0:
-                    shared.printLock.acquire()
-                    print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)
-                    shared.printLock.release()
-                    try:
-                        del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[
-                            self.HOST]  # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together.
-                    except:
-                        pass
-            if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 0:
-                shared.printLock.acquire()
-                print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)
-                shared.printLock.release()
-                numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] = len(
-                    self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)  # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together.
-            if len(self.ackDataThatWeHaveYetToSend) > 0:
-                self.data = self.ackDataThatWeHaveYetToSend.pop()
-        self.processData()
-
-    def isProofOfWorkSufficient(
-        self,
-        data,
-        nonceTrialsPerByte=0,
-            payloadLengthExtraBytes=0):
-        if nonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte:
-            nonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
-        if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes:
-            payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
-        POW, = unpack('>Q', hashlib.sha512(hashlib.sha512(data[
-                      :8] + hashlib.sha512(data[8:]).digest()).digest()).digest()[0:8])
-        # print 'POW:', POW
-        return POW <= 2 ** 64 / ((len(data) + payloadLengthExtraBytes) * (nonceTrialsPerByte))
-
-    def sendpong(self):
-        print 'Sending pong'
-        try:
-            self.sock.sendall(
-                '\xE9\xBE\xB4\xD9\x70\x6F\x6E\x67\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35')
-        except Exception as err:
-            # if not 'Bad file descriptor' in err:
-            shared.printLock.acquire()
-            sys.stderr.write('sock.sendall error: %s\n' % err)
-            shared.printLock.release()
-
-    def recverack(self):
-        print 'verack received'
-        self.verackReceived = True
-        if self.verackSent:
-            # We have thus both sent and received a verack.
-            self.connectionFullyEstablished()
-
-    def connectionFullyEstablished(self):
-        self.connectionIsOrWasFullyEstablished = True
-        if not self.initiatedConnection:
-            shared.UISignalQueue.put(('setStatusIcon', 'green'))
-        self.sock.settimeout(
-            600)  # We'll send out a pong every 5 minutes to make sure the connection stays alive if there has been no other traffic to send lately.
-        shared.UISignalQueue.put(('updateNetworkStatusTab', 'no data'))
-        remoteNodeIncomingPort, remoteNodeSeenTime = shared.knownNodes[
-            self.streamNumber][self.HOST]
-        shared.printLock.acquire()
-        print 'Connection fully established with', self.HOST, remoteNodeIncomingPort
-        print 'The size of the connectedHostsList is now', len(shared.connectedHostsList)
-        print 'The length of sendDataQueues is now:', len(shared.sendDataQueues)
-        print 'broadcasting addr from within connectionFullyEstablished function.'
-        shared.printLock.release()
-        self.broadcastaddr([(int(time.time()), self.streamNumber, 1, self.HOST,
-                           remoteNodeIncomingPort)])  # This lets all of our peers know about this new node.
-        self.sendaddr()  # This is one large addr message to this one peer.
-        if not self.initiatedConnection and len(shared.connectedHostsList) > 200:
-            shared.printLock.acquire()
-            print 'We are connected to too many people. Closing connection.'
-            shared.printLock.release()
-            shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
-            return
-        self.sendBigInv()
-
-    def sendBigInv(self):
-        shared.sqlLock.acquire()
-        # Select all hashes which are younger than two days old and in this
-        # stream.
-        t = (int(time.time()) - maximumAgeOfObjectsThatIAdvertiseToOthers, int(
-            time.time()) - lengthOfTimeToHoldOnToAllPubkeys, self.streamNumber)
-        shared.sqlSubmitQueue.put(
-            '''SELECT hash FROM inventory WHERE ((receivedtime>? and objecttype<>'pubkey') or (receivedtime>? and objecttype='pubkey')) and streamnumber=?''')
-        shared.sqlSubmitQueue.put(t)
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        bigInvList = {}
-        for row in queryreturn:
-            hash, = row
-            if hash not in self.objectsOfWhichThisRemoteNodeIsAlreadyAware:
-                bigInvList[hash] = 0
-        # We also have messages in our inventory in memory (which is a python
-        # dictionary). Let's fetch those too.
-        for hash, storedValue in shared.inventory.items():
-            if hash not in self.objectsOfWhichThisRemoteNodeIsAlreadyAware:
-                objectType, streamNumber, payload, receivedTime = storedValue
-                if streamNumber == self.streamNumber and receivedTime > int(time.time()) - maximumAgeOfObjectsThatIAdvertiseToOthers:
-                    bigInvList[hash] = 0
-        numberOfObjectsInInvMessage = 0
-        payload = ''
-        # Now let us start appending all of these hashes together. They will be
-        # sent out in a big inv message to our new peer.
-        for hash, storedValue in bigInvList.items():
-            payload += hash
-            numberOfObjectsInInvMessage += 1
-            if numberOfObjectsInInvMessage >= 50000:  # We can only send a max of 50000 items per inv message but we may have more objects to advertise. They must be split up into multiple inv messages.
-                self.sendinvMessageToJustThisOnePeer(
-                    numberOfObjectsInInvMessage, payload)
-                payload = ''
-                numberOfObjectsInInvMessage = 0
-        if numberOfObjectsInInvMessage > 0:
-            self.sendinvMessageToJustThisOnePeer(
-                numberOfObjectsInInvMessage, payload)
-
-    # Self explanatory. Notice that there is also a broadcastinv function for
-    # broadcasting invs to everyone in our stream.
-    def sendinvMessageToJustThisOnePeer(self, numberOfObjects, payload):
-        payload = encodeVarint(numberOfObjects) + payload
-        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
-        headerData += 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-        headerData += pack('>L', len(payload))
-        headerData += hashlib.sha512(payload).digest()[:4]
-        shared.printLock.acquire()
-        print 'Sending huge inv message with', numberOfObjects, 'objects to just this one peer'
-        shared.printLock.release()
-        try:
-            self.sock.sendall(headerData + payload)
-        except Exception as err:
-            # if not 'Bad file descriptor' in err:
-            shared.printLock.acquire()
-            sys.stderr.write('sock.sendall error: %s\n' % err)
-            shared.printLock.release()
-
-    # We have received a broadcast message
-    def recbroadcast(self, data):
-        self.messageProcessingStartTime = time.time()
-        # First we must check to make sure the proof of work is sufficient.
-        if not self.isProofOfWorkSufficient(data):
-            print 'Proof of work in broadcast message insufficient.'
-            return
-        readPosition = 8  # bypass the nonce
-        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
-
-        # This section is used for the transition from 32 bit time to 64 bit
-        # time in the protocol.
-        if embeddedTime == 0:
-            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
-            readPosition += 8
-        else:
-            readPosition += 4
-
-        if embeddedTime > (int(time.time()) + 10800):  # prevent funny business
-            print 'The embedded time in this broadcast message is more than three hours in the future. That doesn\'t make sense. Ignoring message.'
-            return
-        if embeddedTime < (int(time.time()) - maximumAgeOfAnObjectThatIAmWillingToAccept):
-            print 'The embedded time in this broadcast message is too old. Ignoring message.'
-            return
-        if len(data) < 180:
-            print 'The payload length of this broadcast packet is unreasonably low. Someone is probably trying funny business. Ignoring message.'
-            return
-        # Let us check to make sure the stream number is correct (thus
-        # preventing an individual from sending broadcasts out on the wrong
-        # streams or all streams).
-        broadcastVersion, broadcastVersionLength = decodeVarint(
-            data[readPosition:readPosition + 10])
-        if broadcastVersion >= 2:
-            streamNumber, streamNumberLength = decodeVarint(data[
-                                                            readPosition + broadcastVersionLength:readPosition + broadcastVersionLength + 10])
-            if streamNumber != self.streamNumber:
-                print 'The stream number encoded in this broadcast message (' + str(streamNumber) + ') does not match the stream number on which it was received. Ignoring it.'
-                return
-
-        shared.inventoryLock.acquire()
-        self.inventoryHash = calculateInventoryHash(data)
-        if self.inventoryHash in shared.inventory:
-            print 'We have already received this broadcast object. Ignoring.'
-            shared.inventoryLock.release()
-            return
-        elif isInSqlInventory(self.inventoryHash):
-            print 'We have already received this broadcast object (it is stored on disk in the SQL inventory). Ignoring it.'
-            shared.inventoryLock.release()
-            return
-        # It is valid so far. Let's let our peers know about it.
-        objectType = 'broadcast'
-        shared.inventory[self.inventoryHash] = (
-            objectType, self.streamNumber, data, embeddedTime)
-        shared.inventoryLock.release()
-        self.broadcastinv(self.inventoryHash)
-        shared.UISignalQueue.put((
-            'incrementNumberOfBroadcastsProcessed', 'no data'))
-
-        self.processbroadcast(
-            readPosition, data)  # When this function returns, we will have either successfully processed this broadcast because we are interested in it, ignored it because we aren't interested in it, or found problem with the broadcast that warranted ignoring it.
-
-        # Let us now set lengthOfTimeWeShouldUseToProcessThisMessage. If we
-        # haven't used the specified amount of time, we shall sleep. These
-        # values are mostly the same values used for msg messages although
-        # broadcast messages are processed faster.
-        if len(data) > 100000000:  # Size is greater than 100 megabytes
-            lengthOfTimeWeShouldUseToProcessThisMessage = 100  # seconds.
-        elif len(data) > 10000000:  # Between 100 and 10 megabytes
-            lengthOfTimeWeShouldUseToProcessThisMessage = 20  # seconds.
-        elif len(data) > 1000000:  # Between 10 and 1 megabyte
-            lengthOfTimeWeShouldUseToProcessThisMessage = 3  # seconds.
-        else:  # Less than 1 megabyte
-            lengthOfTimeWeShouldUseToProcessThisMessage = .6  # seconds.
-
-        sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
-            (time.time() - self.messageProcessingStartTime)
-        if sleepTime > 0:
-            shared.printLock.acquire()
-            print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
-            shared.printLock.release()
-            time.sleep(sleepTime)
-        shared.printLock.acquire()
-        print 'Total message processing time:', time.time() - self.messageProcessingStartTime, 'seconds.'
-        shared.printLock.release()
-
-    # A broadcast message has a valid time and POW and requires processing.
-    # The recbroadcast function calls this one.
-    def processbroadcast(self, readPosition, data):
-        broadcastVersion, broadcastVersionLength = decodeVarint(
-            data[readPosition:readPosition + 9])
-        readPosition += broadcastVersionLength
-        if broadcastVersion < 1 or broadcastVersion > 2:
-            print 'Cannot decode incoming broadcast versions higher than 2. Assuming the sender isn\'t being silly, you should upgrade Bitmessage because this message shall be ignored.'
-            return
-        if broadcastVersion == 1:
-            beginningOfPubkeyPosition = readPosition  # used when we add the pubkey to our pubkey table
-            sendersAddressVersion, sendersAddressVersionLength = decodeVarint(
-                data[readPosition:readPosition + 9])
-            if sendersAddressVersion <= 1 or sendersAddressVersion >= 3:
-                # Cannot decode senderAddressVersion higher than 2. Assuming
-                # the sender isn\'t being silly, you should upgrade Bitmessage
-                # because this message shall be ignored.
-                return
-            readPosition += sendersAddressVersionLength
-            if sendersAddressVersion == 2:
-                sendersStream, sendersStreamLength = decodeVarint(
-                    data[readPosition:readPosition + 9])
-                readPosition += sendersStreamLength
-                behaviorBitfield = data[readPosition:readPosition + 4]
-                readPosition += 4
-                sendersPubSigningKey = '\x04' + \
-                    data[readPosition:readPosition + 64]
-                readPosition += 64
-                sendersPubEncryptionKey = '\x04' + \
-                    data[readPosition:readPosition + 64]
-                readPosition += 64
-                endOfPubkeyPosition = readPosition
-                sendersHash = data[readPosition:readPosition + 20]
-                if sendersHash not in shared.broadcastSendersForWhichImWatching:
-                    # Display timing data
-                    shared.printLock.acquire()
-                    print 'Time spent deciding that we are not interested in this v1 broadcast:', time.time() - self.messageProcessingStartTime
-                    shared.printLock.release()
-                    return
-                # At this point, this message claims to be from sendersHash and
-                # we are interested in it. We still have to hash the public key
-                # to make sure it is truly the key that matches the hash, and
-                # also check the signiture.
-                readPosition += 20
-
-                sha = hashlib.new('sha512')
-                sha.update(sendersPubSigningKey + sendersPubEncryptionKey)
-                ripe = hashlib.new('ripemd160')
-                ripe.update(sha.digest())
-                if ripe.digest() != sendersHash:
-                    # The sender of this message lied.
-                    return
-                messageEncodingType, messageEncodingTypeLength = decodeVarint(
-                    data[readPosition:readPosition + 9])
-                if messageEncodingType == 0:
-                    return
-                readPosition += messageEncodingTypeLength
-                messageLength, messageLengthLength = decodeVarint(
-                    data[readPosition:readPosition + 9])
-                readPosition += messageLengthLength
-                message = data[readPosition:readPosition + messageLength]
-                readPosition += messageLength
-                readPositionAtBottomOfMessage = readPosition
-                signatureLength, signatureLengthLength = decodeVarint(
-                    data[readPosition:readPosition + 9])
-                readPosition += signatureLengthLength
-                signature = data[readPosition:readPosition + signatureLength]
-                try:
-                    if not highlevelcrypto.verify(data[12:readPositionAtBottomOfMessage], signature, sendersPubSigningKey.encode('hex')):
-                        print 'ECDSA verify failed'
-                        return
-                    print 'ECDSA verify passed'
-                except Exception as err:
-                    print 'ECDSA verify failed', err
-                    return
-                # verify passed
-
-                # Let's store the public key in case we want to reply to this person.
-                # We don't have the correct nonce or time (which would let us
-                # send out a pubkey message) so we'll just fill it with 1's. We
-                # won't be able to send this pubkey to others (without doing
-                # the proof of work ourselves, which this program is programmed
-                # to not do.)
-                t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + data[
-                     beginningOfPubkeyPosition:endOfPubkeyPosition], int(time.time()), 'yes')
-                shared.sqlLock.acquire()
-                shared.sqlSubmitQueue.put(
-                    '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
-                shared.sqlSubmitQueue.put(t)
-                shared.sqlReturnQueue.get()
-                shared.sqlSubmitQueue.put('commit')
-                shared.sqlLock.release()
-                # shared.workerQueue.put(('newpubkey',(sendersAddressVersion,sendersStream,ripe.digest())))
-                # This will check to see whether we happen to be awaiting this
-                # pubkey in order to send a message. If we are, it will do the
-                # POW and send it.
-                self.possibleNewPubkey(ripe.digest())
-
-                fromAddress = encodeAddress(
-                    sendersAddressVersion, sendersStream, ripe.digest())
-                shared.printLock.acquire()
-                print 'fromAddress:', fromAddress
-                shared.printLock.release()
-                if messageEncodingType == 2:
-                    bodyPositionIndex = string.find(message, '\nBody:')
-                    if bodyPositionIndex > 1:
-                        subject = message[8:bodyPositionIndex]
-                        body = message[bodyPositionIndex + 6:]
-                    else:
-                        subject = ''
-                        body = message
-                elif messageEncodingType == 1:
-                    body = message
-                    subject = ''
-                elif messageEncodingType == 0:
-                    print 'messageEncodingType == 0. Doing nothing with the message.'
-                else:
-                    body = 'Unknown encoding type.\n\n' + repr(message)
-                    subject = ''
-
-                toAddress = '[Broadcast subscribers]'
-                if messageEncodingType != 0:
-                    shared.sqlLock.acquire()
-                    t = (self.inventoryHash, toAddress, fromAddress, subject, int(
-                        time.time()), body, 'inbox', messageEncodingType, 0)
-                    shared.sqlSubmitQueue.put(
-                        '''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''')
-                    shared.sqlSubmitQueue.put(t)
-                    shared.sqlReturnQueue.get()
-                    shared.sqlSubmitQueue.put('commit')
-                    shared.sqlLock.release()
-                    shared.UISignalQueue.put(('displayNewInboxMessage', (
-                        self.inventoryHash, toAddress, fromAddress, subject, body)))
-
-                    # If we are behaving as an API then we might need to run an
-                    # outside command to let some program know that a new
-                    # message has arrived.
-                    if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
-                        try:
-                            apiNotifyPath = shared.config.get(
-                                'bitmessagesettings', 'apinotifypath')
-                        except:
-                            apiNotifyPath = ''
-                        if apiNotifyPath != '':
-                            call([apiNotifyPath, "newBroadcast"])
-
-                # Display timing data
-                shared.printLock.acquire()
-                print 'Time spent processing this interesting broadcast:', time.time() - self.messageProcessingStartTime
-                shared.printLock.release()
-        if broadcastVersion == 2:
-            cleartextStreamNumber, cleartextStreamNumberLength = decodeVarint(
-                data[readPosition:readPosition + 10])
-            readPosition += cleartextStreamNumberLength
-            initialDecryptionSuccessful = False
-            for key, cryptorObject in shared.MyECSubscriptionCryptorObjects.items():
-                try:
-                    decryptedData = cryptorObject.decrypt(data[readPosition:])
-                    toRipe = key  # This is the RIPE hash of the sender's pubkey. We need this below to compare to the RIPE hash of the sender's address to verify that it was encrypted by with their key rather than some other key.
-                    initialDecryptionSuccessful = True
-                    print 'EC decryption successful using key associated with ripe hash:', key.encode('hex')
-                    break
-                except Exception as err:
-                    pass
-                    # print 'cryptorObject.decrypt Exception:', err
-            if not initialDecryptionSuccessful:
-                # This is not a broadcast I am interested in.
-                shared.printLock.acquire()
-                print 'Length of time program spent failing to decrypt this v2 broadcast:', time.time() - self.messageProcessingStartTime, 'seconds.'
-                shared.printLock.release()
-                return
-            # At this point this is a broadcast I have decrypted and thus am
-            # interested in.
-            signedBroadcastVersion, readPosition = decodeVarint(
-                decryptedData[:10])
-            beginningOfPubkeyPosition = readPosition  # used when we add the pubkey to our pubkey table
-            sendersAddressVersion, sendersAddressVersionLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 9])
-            if sendersAddressVersion < 2 or sendersAddressVersion > 3:
-                print 'Cannot decode senderAddressVersion other than 2 or 3. Assuming the sender isn\'t being silly, you should upgrade Bitmessage because this message shall be ignored.'
-                return
-            readPosition += sendersAddressVersionLength
-            sendersStream, sendersStreamLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 9])
-            if sendersStream != cleartextStreamNumber:
-                print 'The stream number outside of the encryption on which the POW was completed doesn\'t match the stream number inside the encryption. Ignoring broadcast.'
-                return
-            readPosition += sendersStreamLength
-            behaviorBitfield = decryptedData[readPosition:readPosition + 4]
-            readPosition += 4
-            sendersPubSigningKey = '\x04' + \
-                decryptedData[readPosition:readPosition + 64]
-            readPosition += 64
-            sendersPubEncryptionKey = '\x04' + \
-                decryptedData[readPosition:readPosition + 64]
-            readPosition += 64
-            if sendersAddressVersion >= 3:
-                requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(
-                    decryptedData[readPosition:readPosition + 10])
-                readPosition += varintLength
-                print 'sender\'s requiredAverageProofOfWorkNonceTrialsPerByte is', requiredAverageProofOfWorkNonceTrialsPerByte
-                requiredPayloadLengthExtraBytes, varintLength = decodeVarint(
-                    decryptedData[readPosition:readPosition + 10])
-                readPosition += varintLength
-                print 'sender\'s requiredPayloadLengthExtraBytes is', requiredPayloadLengthExtraBytes
-            endOfPubkeyPosition = readPosition
-
-            sha = hashlib.new('sha512')
-            sha.update(sendersPubSigningKey + sendersPubEncryptionKey)
-            ripe = hashlib.new('ripemd160')
-            ripe.update(sha.digest())
-
-            if toRipe != ripe.digest():
-                print 'The encryption key used to encrypt this message doesn\'t match the keys inbedded in the message itself. Ignoring message.'
-                return
-            messageEncodingType, messageEncodingTypeLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 9])
-            if messageEncodingType == 0:
-                return
-            readPosition += messageEncodingTypeLength
-            messageLength, messageLengthLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 9])
-            readPosition += messageLengthLength
-            message = decryptedData[readPosition:readPosition + messageLength]
-            readPosition += messageLength
-            readPositionAtBottomOfMessage = readPosition
-            signatureLength, signatureLengthLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 9])
-            readPosition += signatureLengthLength
-            signature = decryptedData[
-                readPosition:readPosition + signatureLength]
-            try:
-                if not highlevelcrypto.verify(decryptedData[:readPositionAtBottomOfMessage], signature, sendersPubSigningKey.encode('hex')):
-                    print 'ECDSA verify failed'
-                    return
-                print 'ECDSA verify passed'
-            except Exception as err:
-                print 'ECDSA verify failed', err
-                return
-            # verify passed
-
-            # Let's store the public key in case we want to reply to this
-            # person.
-            t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + decryptedData[
-                 beginningOfPubkeyPosition:endOfPubkeyPosition], int(time.time()), 'yes')
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
-            # shared.workerQueue.put(('newpubkey',(sendersAddressVersion,sendersStream,ripe.digest())))
-            # This will check to see whether we happen to be awaiting this
-            # pubkey in order to send a message. If we are, it will do the POW
-            # and send it.
-            self.possibleNewPubkey(ripe.digest())
-
-            fromAddress = encodeAddress(
-                sendersAddressVersion, sendersStream, ripe.digest())
-            shared.printLock.acquire()
-            print 'fromAddress:', fromAddress
-            shared.printLock.release()
-            if messageEncodingType == 2:
-                bodyPositionIndex = string.find(message, '\nBody:')
-                if bodyPositionIndex > 1:
-                    subject = message[8:bodyPositionIndex]
-                    body = message[bodyPositionIndex + 6:]
-                else:
-                    subject = ''
-                    body = message
-            elif messageEncodingType == 1:
-                body = message
-                subject = ''
-            elif messageEncodingType == 0:
-                print 'messageEncodingType == 0. Doing nothing with the message.'
-            else:
-                body = 'Unknown encoding type.\n\n' + repr(message)
-                subject = ''
-
-            toAddress = '[Broadcast subscribers]'
-            if messageEncodingType != 0:
-                shared.sqlLock.acquire()
-                t = (self.inventoryHash, toAddress, fromAddress, subject, int(
-                    time.time()), body, 'inbox', messageEncodingType, 0)
-                shared.sqlSubmitQueue.put(
-                    '''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''')
-                shared.sqlSubmitQueue.put(t)
-                shared.sqlReturnQueue.get()
-                shared.sqlSubmitQueue.put('commit')
-                shared.sqlLock.release()
-                shared.UISignalQueue.put(('displayNewInboxMessage', (
-                    self.inventoryHash, toAddress, fromAddress, subject, body)))
-
-                # If we are behaving as an API then we might need to run an
-                # outside command to let some program know that a new message
-                # has arrived.
-                if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
-                    try:
-                        apiNotifyPath = shared.config.get(
-                            'bitmessagesettings', 'apinotifypath')
-                    except:
-                        apiNotifyPath = ''
-                    if apiNotifyPath != '':
-                        call([apiNotifyPath, "newBroadcast"])
-
-            # Display timing data
-            shared.printLock.acquire()
-            print 'Time spent processing this interesting broadcast:', time.time() - self.messageProcessingStartTime
-            shared.printLock.release()
-
-    # We have received a msg message.
-    def recmsg(self, data):
-        self.messageProcessingStartTime = time.time()
-        # First we must check to make sure the proof of work is sufficient.
-        if not self.isProofOfWorkSufficient(data):
-            print 'Proof of work in msg message insufficient.'
-            return
-
-        readPosition = 8
-        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
-
-        # This section is used for the transition from 32 bit time to 64 bit
-        # time in the protocol.
-        if embeddedTime == 0:
-            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
-            readPosition += 8
-        else:
-            readPosition += 4
-
-        if embeddedTime > int(time.time()) + 10800:
-            print 'The time in the msg message is too new. Ignoring it. Time:', embeddedTime
-            return
-        if embeddedTime < int(time.time()) - maximumAgeOfAnObjectThatIAmWillingToAccept:
-            print 'The time in the msg message is too old. Ignoring it. Time:', embeddedTime
-            return
-        streamNumberAsClaimedByMsg, streamNumberAsClaimedByMsgLength = decodeVarint(
-            data[readPosition:readPosition + 9])
-        if streamNumberAsClaimedByMsg != self.streamNumber:
-            print 'The stream number encoded in this msg (' + str(streamNumberAsClaimedByMsg) + ') message does not match the stream number on which it was received. Ignoring it.'
-            return
-        readPosition += streamNumberAsClaimedByMsgLength
-        self.inventoryHash = calculateInventoryHash(data)
-        shared.inventoryLock.acquire()
-        if self.inventoryHash in shared.inventory:
-            print 'We have already received this msg message. Ignoring.'
-            shared.inventoryLock.release()
-            return
-        elif isInSqlInventory(self.inventoryHash):
-            print 'We have already received this msg message (it is stored on disk in the SQL inventory). Ignoring it.'
-            shared.inventoryLock.release()
-            return
-        # This msg message is valid. Let's let our peers know about it.
-        objectType = 'msg'
-        shared.inventory[self.inventoryHash] = (
-            objectType, self.streamNumber, data, embeddedTime)
-        shared.inventoryLock.release()
-        self.broadcastinv(self.inventoryHash)
-        shared.UISignalQueue.put((
-            'incrementNumberOfMessagesProcessed', 'no data'))
-
-        self.processmsg(
-            readPosition, data)  # When this function returns, we will have either successfully processed the message bound for us, ignored it because it isn't bound for us, or found problem with the message that warranted ignoring it.
-
-        # Let us now set lengthOfTimeWeShouldUseToProcessThisMessage. If we
-        # haven't used the specified amount of time, we shall sleep. These
-        # values are based on test timings and you may change them at-will.
-        if len(data) > 100000000:  # Size is greater than 100 megabytes
-            lengthOfTimeWeShouldUseToProcessThisMessage = 100  # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 100 MB message: 3.7 seconds.
-        elif len(data) > 10000000:  # Between 100 and 10 megabytes
-            lengthOfTimeWeShouldUseToProcessThisMessage = 20  # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 10 MB message: 0.53 seconds. Actual length of time it takes in practice when processing a real message: 1.44 seconds.
-        elif len(data) > 1000000:  # Between 10 and 1 megabyte
-            lengthOfTimeWeShouldUseToProcessThisMessage = 3  # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 1 MB message: 0.18 seconds. Actual length of time it takes in practice when processing a real message: 0.30 seconds.
-        else:  # Less than 1 megabyte
-            lengthOfTimeWeShouldUseToProcessThisMessage = .6  # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 100 KB message: 0.15 seconds. Actual length of time it takes in practice when processing a real message: 0.25 seconds.
-
-        sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
-            (time.time() - self.messageProcessingStartTime)
-        if sleepTime > 0:
-            shared.printLock.acquire()
-            print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
-            shared.printLock.release()
-            time.sleep(sleepTime)
-        shared.printLock.acquire()
-        print 'Total message processing time:', time.time() - self.messageProcessingStartTime, 'seconds.'
-        shared.printLock.release()
-
-    # A msg message has a valid time and POW and requires processing. The
-    # recmsg function calls this one.
-    def processmsg(self, readPosition, encryptedData):
-        initialDecryptionSuccessful = False
-        # Let's check whether this is a message acknowledgement bound for us.
-        if encryptedData[readPosition:] in ackdataForWhichImWatching:
-            shared.printLock.acquire()
-            print 'This msg IS an acknowledgement bound for me.'
-            shared.printLock.release()
-            del ackdataForWhichImWatching[encryptedData[readPosition:]]
-            t = ('ackreceived', encryptedData[readPosition:])
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                'UPDATE sent SET status=? WHERE ackdata=?')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
-            shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (encryptedData[readPosition:], _translate("MainWindow",'Acknowledgement of the message received. %1').arg(unicode(
-                strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
-            return
-        else:
-            shared.printLock.acquire()
-            print 'This was NOT an acknowledgement bound for me.'
-            # print 'ackdataForWhichImWatching', ackdataForWhichImWatching
-            shared.printLock.release()
-
-        # This is not an acknowledgement bound for me. See if it is a message
-        # bound for me by trying to decrypt it with my private keys.
-        for key, cryptorObject in shared.myECCryptorObjects.items():
-            try:
-                decryptedData = cryptorObject.decrypt(
-                    encryptedData[readPosition:])
-                toRipe = key  # This is the RIPE hash of my pubkeys. We need this below to compare to the destination_ripe included in the encrypted data.
-                initialDecryptionSuccessful = True
-                print 'EC decryption successful using key associated with ripe hash:', key.encode('hex')
-                break
-            except Exception as err:
-                pass
-                # print 'cryptorObject.decrypt Exception:', err
-        if not initialDecryptionSuccessful:
-            # This is not a message bound for me.
-            shared.printLock.acquire()
-            print 'Length of time program spent failing to decrypt this message:', time.time() - self.messageProcessingStartTime, 'seconds.'
-            shared.printLock.release()
-        else:
-            # This is a message bound for me.
-            toAddress = shared.myAddressesByHash[
-                toRipe]  # Look up my address based on the RIPE hash.
-            readPosition = 0
-            messageVersion, messageVersionLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 10])
-            readPosition += messageVersionLength
-            if messageVersion != 1:
-                print 'Cannot understand message versions other than one. Ignoring message.'
-                return
-            sendersAddressVersionNumber, sendersAddressVersionNumberLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 10])
-            readPosition += sendersAddressVersionNumberLength
-            if sendersAddressVersionNumber == 0:
-                print 'Cannot understand sendersAddressVersionNumber = 0. Ignoring message.'
-                return
-            if sendersAddressVersionNumber >= 4:
-                print 'Sender\'s address version number', sendersAddressVersionNumber, 'not yet supported. Ignoring message.'
-                return
-            if len(decryptedData) < 170:
-                print 'Length of the unencrypted data is unreasonably short. Sanity check failed. Ignoring message.'
-                return
-            sendersStreamNumber, sendersStreamNumberLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 10])
-            if sendersStreamNumber == 0:
-                print 'sender\'s stream number is 0. Ignoring message.'
-                return
-            readPosition += sendersStreamNumberLength
-            behaviorBitfield = decryptedData[readPosition:readPosition + 4]
-            readPosition += 4
-            pubSigningKey = '\x04' + decryptedData[
-                readPosition:readPosition + 64]
-            readPosition += 64
-            pubEncryptionKey = '\x04' + decryptedData[
-                readPosition:readPosition + 64]
-            readPosition += 64
-            if sendersAddressVersionNumber >= 3:
-                requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(
-                    decryptedData[readPosition:readPosition + 10])
-                readPosition += varintLength
-                print 'sender\'s requiredAverageProofOfWorkNonceTrialsPerByte is', requiredAverageProofOfWorkNonceTrialsPerByte
-                requiredPayloadLengthExtraBytes, varintLength = decodeVarint(
-                    decryptedData[readPosition:readPosition + 10])
-                readPosition += varintLength
-                print 'sender\'s requiredPayloadLengthExtraBytes is', requiredPayloadLengthExtraBytes
-            endOfThePublicKeyPosition = readPosition  # needed for when we store the pubkey in our database of pubkeys for later use.
-            if toRipe != decryptedData[readPosition:readPosition + 20]:
-                shared.printLock.acquire()
-                print 'The original sender of this message did not send it to you. Someone is attempting a Surreptitious Forwarding Attack.'
-                print 'See: http://world.std.com/~dtd/sign_encrypt/sign_encrypt7.html'
-                print 'your toRipe:', toRipe.encode('hex')
-                print 'embedded destination toRipe:', decryptedData[readPosition:readPosition + 20].encode('hex')
-                shared.printLock.release()
-                return
-            readPosition += 20
-            messageEncodingType, messageEncodingTypeLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 10])
-            readPosition += messageEncodingTypeLength
-            messageLength, messageLengthLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 10])
-            readPosition += messageLengthLength
-            message = decryptedData[readPosition:readPosition + messageLength]
-            # print 'First 150 characters of message:', repr(message[:150])
-            readPosition += messageLength
-            ackLength, ackLengthLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 10])
-            readPosition += ackLengthLength
-            ackData = decryptedData[readPosition:readPosition + ackLength]
-            readPosition += ackLength
-            positionOfBottomOfAckData = readPosition  # needed to mark the end of what is covered by the signature
-            signatureLength, signatureLengthLength = decodeVarint(
-                decryptedData[readPosition:readPosition + 10])
-            readPosition += signatureLengthLength
-            signature = decryptedData[
-                readPosition:readPosition + signatureLength]
-            try:
-                if not highlevelcrypto.verify(decryptedData[:positionOfBottomOfAckData], signature, pubSigningKey.encode('hex')):
-                    print 'ECDSA verify failed'
-                    return
-                print 'ECDSA verify passed'
-            except Exception as err:
-                print 'ECDSA verify failed', err
-                return
-            shared.printLock.acquire()
-            print 'As a matter of intellectual curiosity, here is the Bitcoin address associated with the keys owned by the other person:', calculateBitcoinAddressFromPubkey(pubSigningKey), '  ..and here is the testnet address:', calculateTestnetAddressFromPubkey(pubSigningKey), '. The other person must take their private signing key from Bitmessage and import it into Bitcoin (or a service like Blockchain.info) for it to be of any use. Do not use this unless you know what you are doing.'
-            shared.printLock.release()
-            # calculate the fromRipe.
-            sha = hashlib.new('sha512')
-            sha.update(pubSigningKey + pubEncryptionKey)
-            ripe = hashlib.new('ripemd160')
-            ripe.update(sha.digest())
-            # Let's store the public key in case we want to reply to this
-            # person.
-            t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + decryptedData[
-                 messageVersionLength:endOfThePublicKeyPosition], int(time.time()), 'yes')
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
-            # shared.workerQueue.put(('newpubkey',(sendersAddressVersionNumber,sendersStreamNumber,ripe.digest())))
-            # This will check to see whether we happen to be awaiting this
-            # pubkey in order to send a message. If we are, it will do the POW
-            # and send it.
-            self.possibleNewPubkey(ripe.digest())
-            fromAddress = encodeAddress(
-                sendersAddressVersionNumber, sendersStreamNumber, ripe.digest())
-            # If this message is bound for one of my version 3 addresses (or
-            # higher), then we must check to make sure it meets our demanded
-            # proof of work requirement.
-            if decodeAddress(toAddress)[1] >= 3:  # If the toAddress version number is 3 or higher:
-                if not shared.isAddressInMyAddressBookSubscriptionsListOrWhitelist(fromAddress):  # If I'm not friendly with this person:
-                    requiredNonceTrialsPerByte = shared.config.getint(
-                        toAddress, 'noncetrialsperbyte')
-                    requiredPayloadLengthExtraBytes = shared.config.getint(
-                        toAddress, 'payloadlengthextrabytes')
-                    if not self.isProofOfWorkSufficient(encryptedData, requiredNonceTrialsPerByte, requiredPayloadLengthExtraBytes):
-                        print 'Proof of work in msg message insufficient only because it does not meet our higher requirement.'
-                        return
-            blockMessage = False  # Gets set to True if the user shouldn't see the message according to black or white lists.
-            if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black':  # If we are using a blacklist
-                t = (fromAddress,)
-                shared.sqlLock.acquire()
-                shared.sqlSubmitQueue.put(
-                    '''SELECT label FROM blacklist where address=? and enabled='1' ''')
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlLock.release()
-                if queryreturn != []:
-                    shared.printLock.acquire()
-                    print 'Message ignored because address is in blacklist.'
-                    shared.printLock.release()
-                    blockMessage = True
-            else:  # We're using a whitelist
-                t = (fromAddress,)
-                shared.sqlLock.acquire()
-                shared.sqlSubmitQueue.put(
-                    '''SELECT label FROM whitelist where address=? and enabled='1' ''')
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlLock.release()
-                if queryreturn == []:
-                    print 'Message ignored because address not in whitelist.'
-                    blockMessage = True
-            if not blockMessage:
-                print 'fromAddress:', fromAddress
-                print 'First 150 characters of message:', repr(message[:150])
-
-                toLabel = shared.config.get(toAddress, 'label')
-                if toLabel == '':
-                    toLabel = toAddress
-
-                if messageEncodingType == 2:
-                    bodyPositionIndex = string.find(message, '\nBody:')
-                    if bodyPositionIndex > 1:
-                        subject = message[8:bodyPositionIndex]
-                        subject = subject[
-                            :500]  # Only save and show the first 500 characters of the subject. Any more is probably an attak.
-                        body = message[bodyPositionIndex + 6:]
-                    else:
-                        subject = ''
-                        body = message
-                elif messageEncodingType == 1:
-                    body = message
-                    subject = ''
-                elif messageEncodingType == 0:
-                    print 'messageEncodingType == 0. Doing nothing with the message. They probably just sent it so that we would store their public key or send their ack data for them.'
-                else:
-                    body = 'Unknown encoding type.\n\n' + repr(message)
-                    subject = ''
-                if messageEncodingType != 0:
-                    shared.sqlLock.acquire()
-                    t = (self.inventoryHash, toAddress, fromAddress, subject, int(
-                        time.time()), body, 'inbox', messageEncodingType, 0)
-                    shared.sqlSubmitQueue.put(
-                        '''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''')
-                    shared.sqlSubmitQueue.put(t)
-                    shared.sqlReturnQueue.get()
-                    shared.sqlSubmitQueue.put('commit')
-                    shared.sqlLock.release()
-                    shared.UISignalQueue.put(('displayNewInboxMessage', (
-                        self.inventoryHash, toAddress, fromAddress, subject, body)))
-
-                # If we are behaving as an API then we might need to run an
-                # outside command to let some program know that a new message
-                # has arrived.
-                if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
-                    try:
-                        apiNotifyPath = shared.config.get(
-                            'bitmessagesettings', 'apinotifypath')
-                    except:
-                        apiNotifyPath = ''
-                    if apiNotifyPath != '':
-                        call([apiNotifyPath, "newMessage"])
-
-                # Let us now check and see whether our receiving address is
-                # behaving as a mailing list
-                if shared.safeConfigGetBoolean(toAddress, 'mailinglist'):
-                    try:
-                        mailingListName = shared.config.get(
-                            toAddress, 'mailinglistname')
-                    except:
-                        mailingListName = ''
-                    # Let us send out this message as a broadcast
-                    subject = self.addMailingListNameToSubject(
-                        subject, mailingListName)
-                    # Let us now send this message out as a broadcast
-                    message = strftime("%a, %Y-%m-%d %H:%M:%S UTC", gmtime(
-                    )) + '   Message ostensibly from ' + fromAddress + ':\n\n' + body
-                    fromAddress = toAddress  # The fromAddress for the broadcast that we are about to send is the toAddress (my address) for the msg message we are currently processing.
-                    ackdata = OpenSSL.rand(
-                        32)  # We don't actually need the ackdata for acknowledgement since this is a broadcast message but we can use it to update the user interface when the POW is done generating.
-                    toAddress = '[Broadcast subscribers]'
-                    ripe = ''
-                    shared.sqlLock.acquire()
-                    t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int(
-                        time.time()), 'broadcastqueued', 1, 1, 'sent', 2)
-                    shared.sqlSubmitQueue.put(
-                        '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
-                    shared.sqlSubmitQueue.put(t)
-                    shared.sqlReturnQueue.get()
-                    shared.sqlSubmitQueue.put('commit')
-                    shared.sqlLock.release()
-
-                    shared.UISignalQueue.put(('displayNewSentMessage', (
-                        toAddress, '[Broadcast subscribers]', fromAddress, subject, message, ackdata)))
-                    shared.workerQueue.put(('sendbroadcast', ''))
-
-            if self.isAckDataValid(ackData):
-                print 'ackData is valid. Will process it.'
-                self.ackDataThatWeHaveYetToSend.append(
-                    ackData)  # When we have processed all data, the processData function will pop the ackData out and process it as if it is a message received from our peer.
-            # Display timing data
-            timeRequiredToAttemptToDecryptMessage = time.time(
-            ) - self.messageProcessingStartTime
-            successfullyDecryptMessageTimings.append(
-                timeRequiredToAttemptToDecryptMessage)
-            sum = 0
-            for item in successfullyDecryptMessageTimings:
-                sum += item
-            shared.printLock.acquire()
-            print 'Time to decrypt this message successfully:', timeRequiredToAttemptToDecryptMessage
-            print 'Average time for all message decryption successes since startup:', sum / len(successfullyDecryptMessageTimings)
-            shared.printLock.release()
-
-    def isAckDataValid(self, ackData):
-        if len(ackData) < 24:
-            print 'The length of ackData is unreasonably short. Not sending ackData.'
-            return False
-        if ackData[0:4] != '\xe9\xbe\xb4\xd9':
-            print 'Ackdata magic bytes were wrong. Not sending ackData.'
-            return False
-        ackDataPayloadLength, = unpack('>L', ackData[16:20])
-        if len(ackData) - 24 != ackDataPayloadLength:
-            print 'ackData payload length doesn\'t match the payload length specified in the header. Not sending ackdata.'
-            return False
-        if ackData[4:16] != 'getpubkey\x00\x00\x00' and ackData[4:16] != 'pubkey\x00\x00\x00\x00\x00\x00' and ackData[4:16] != 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' and ackData[4:16] != 'broadcast\x00\x00\x00':
-            return False
-        return True
-
-    def addMailingListNameToSubject(self, subject, mailingListName):
-        subject = subject.strip()
-        if subject[:3] == 'Re:' or subject[:3] == 'RE:':
-            subject = subject[3:].strip()
-        if '[' + mailingListName + ']' in subject:
-            return subject
-        else:
-            return '[' + mailingListName + '] ' + subject
-
-    def possibleNewPubkey(self, toRipe):
-        if toRipe in neededPubkeys:
-            print 'We have been awaiting the arrival of this pubkey.'
-            del neededPubkeys[toRipe]
-            t = (toRipe,)
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''UPDATE sent SET status='doingmsgpow' WHERE toripe=? AND status='awaitingpubkey' and folder='sent' ''')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
-            shared.workerQueue.put(('sendmessage', ''))
-        else:
-            shared.printLock.acquire()
-            print 'We don\'t need this pub key. We didn\'t ask for it. Pubkey hash:', toRipe.encode('hex')
-            shared.printLock.release()
-
-    # We have received a pubkey
-    def recpubkey(self, data):
-        self.pubkeyProcessingStartTime = time.time()
-        if len(data) < 146 or len(data) > 600:  # sanity check
-            return
-        # We must check to make sure the proof of work is sufficient.
-        if not self.isProofOfWorkSufficient(data):
-            print 'Proof of work in pubkey message insufficient.'
-            return
-
-        readPosition = 8  # for the nonce
-        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
-
-        # This section is used for the transition from 32 bit time to 64 bit
-        # time in the protocol.
-        if embeddedTime == 0:
-            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
-            readPosition += 8
-        else:
-            readPosition += 4
-
-        if embeddedTime < int(time.time()) - lengthOfTimeToHoldOnToAllPubkeys:
-            shared.printLock.acquire()
-            print 'The embedded time in this pubkey message is too old. Ignoring. Embedded time is:', embeddedTime
-            shared.printLock.release()
-            return
-        if embeddedTime > int(time.time()) + 10800:
-            shared.printLock.acquire()
-            print 'The embedded time in this pubkey message more than several hours in the future. This is irrational. Ignoring message.'
-            shared.printLock.release()
-            return
-        addressVersion, varintLength = decodeVarint(
-            data[readPosition:readPosition + 10])
-        readPosition += varintLength
-        streamNumber, varintLength = decodeVarint(
-            data[readPosition:readPosition + 10])
-        readPosition += varintLength
-        if self.streamNumber != streamNumber:
-            print 'stream number embedded in this pubkey doesn\'t match our stream number. Ignoring.'
-            return
-
-        inventoryHash = calculateInventoryHash(data)
-        shared.inventoryLock.acquire()
-        if inventoryHash in shared.inventory:
-            print 'We have already received this pubkey. Ignoring it.'
-            shared.inventoryLock.release()
-            return
-        elif isInSqlInventory(inventoryHash):
-            print 'We have already received this pubkey (it is stored on disk in the SQL inventory). Ignoring it.'
-            shared.inventoryLock.release()
-            return
-        objectType = 'pubkey'
-        shared.inventory[inventoryHash] = (
-            objectType, self.streamNumber, data, embeddedTime)
-        shared.inventoryLock.release()
-        self.broadcastinv(inventoryHash)
-        shared.UISignalQueue.put((
-            'incrementNumberOfPubkeysProcessed', 'no data'))
-
-        self.processpubkey(data)
-
-        lengthOfTimeWeShouldUseToProcessThisMessage = .2
-        sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
-            (time.time() - self.pubkeyProcessingStartTime)
-        if sleepTime > 0:
-            shared.printLock.acquire()
-            print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
-            shared.printLock.release()
-            time.sleep(sleepTime)
-        shared.printLock.acquire()
-        print 'Total pubkey processing time:', time.time() - self.pubkeyProcessingStartTime, 'seconds.'
-        shared.printLock.release()
-
-    def processpubkey(self, data):
-        readPosition = 8  # for the nonce
-        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
-
-        # This section is used for the transition from 32 bit time to 64 bit
-        # time in the protocol.
-        if embeddedTime == 0:
-            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
-            readPosition += 8
-        else:
-            readPosition += 4
-
-        addressVersion, varintLength = decodeVarint(
-            data[readPosition:readPosition + 10])
-        readPosition += varintLength
-        streamNumber, varintLength = decodeVarint(
-            data[readPosition:readPosition + 10])
-        readPosition += varintLength
-        if addressVersion == 0:
-            print '(Within processpubkey) addressVersion of 0 doesn\'t make sense.'
-            return
-        if addressVersion >= 4 or addressVersion == 1:
-            shared.printLock.acquire()
-            print 'This version of Bitmessage cannot handle version', addressVersion, 'addresses.'
-            shared.printLock.release()
-            return
-        if addressVersion == 2:
-            if len(data) < 146:  # sanity check. This is the minimum possible length.
-                print '(within processpubkey) payloadLength less than 146. Sanity check failed.'
-                return
-            bitfieldBehaviors = data[readPosition:readPosition + 4]
-            readPosition += 4
-            publicSigningKey = data[readPosition:readPosition + 64]
-            # Is it possible for a public key to be invalid such that trying to
-            # encrypt or sign with it will cause an error? If it is, we should
-            # probably test these keys here.
-            readPosition += 64
-            publicEncryptionKey = data[readPosition:readPosition + 64]
-            if len(publicEncryptionKey) < 64:
-                print 'publicEncryptionKey length less than 64. Sanity check failed.'
-                return
-            sha = hashlib.new('sha512')
-            sha.update(
-                '\x04' + publicSigningKey + '\x04' + publicEncryptionKey)
-            ripeHasher = hashlib.new('ripemd160')
-            ripeHasher.update(sha.digest())
-            ripe = ripeHasher.digest()
-
-            shared.printLock.acquire()
-            print 'within recpubkey, addressVersion:', addressVersion, ', streamNumber:', streamNumber
-            print 'ripe', ripe.encode('hex')
-            print 'publicSigningKey in hex:', publicSigningKey.encode('hex')
-            print 'publicEncryptionKey in hex:', publicEncryptionKey.encode('hex')
-            shared.printLock.release()
-
-            t = (ripe,)
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''SELECT usedpersonally FROM pubkeys WHERE hash=? AND usedpersonally='yes' ''')
-            shared.sqlSubmitQueue.put(t)
-            queryreturn = shared.sqlReturnQueue.get()
-            shared.sqlLock.release()
-            if queryreturn != []:  # if this pubkey is already in our database and if we have used it personally:
-                print 'We HAVE used this pubkey personally. Updating time.'
-                t = (ripe, data, embeddedTime, 'yes')
-            else:
-                print 'We have NOT used this pubkey personally. Inserting in database.'
-                t = (ripe, data, embeddedTime, 'no')
-                     # This will also update the embeddedTime.
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
-            # shared.workerQueue.put(('newpubkey',(addressVersion,streamNumber,ripe)))
-            self.possibleNewPubkey(ripe)
-        if addressVersion == 3:
-            if len(data) < 170:  # sanity check.
-                print '(within processpubkey) payloadLength less than 170. Sanity check failed.'
-                return
-            bitfieldBehaviors = data[readPosition:readPosition + 4]
-            readPosition += 4
-            publicSigningKey = '\x04' + data[readPosition:readPosition + 64]
-            # Is it possible for a public key to be invalid such that trying to
-            # encrypt or sign with it will cause an error? If it is, we should
-            # probably test these keys here.
-            readPosition += 64
-            publicEncryptionKey = '\x04' + data[readPosition:readPosition + 64]
-            readPosition += 64
-            specifiedNonceTrialsPerByte, specifiedNonceTrialsPerByteLength = decodeVarint(
-                data[readPosition:readPosition + 10])
-            readPosition += specifiedNonceTrialsPerByteLength
-            specifiedPayloadLengthExtraBytes, specifiedPayloadLengthExtraBytesLength = decodeVarint(
-                data[readPosition:readPosition + 10])
-            readPosition += specifiedPayloadLengthExtraBytesLength
-            endOfSignedDataPosition = readPosition
-            signatureLength, signatureLengthLength = decodeVarint(
-                data[readPosition:readPosition + 10])
-            readPosition += signatureLengthLength
-            signature = data[readPosition:readPosition + signatureLength]
-            try:
-                if not highlevelcrypto.verify(data[8:endOfSignedDataPosition], signature, publicSigningKey.encode('hex')):
-                    print 'ECDSA verify failed (within processpubkey)'
-                    return
-                print 'ECDSA verify passed (within processpubkey)'
-            except Exception as err:
-                print 'ECDSA verify failed (within processpubkey)', err
-                return
-
-            sha = hashlib.new('sha512')
-            sha.update(publicSigningKey + publicEncryptionKey)
-            ripeHasher = hashlib.new('ripemd160')
-            ripeHasher.update(sha.digest())
-            ripe = ripeHasher.digest()
-
-            shared.printLock.acquire()
-            print 'within recpubkey, addressVersion:', addressVersion, ', streamNumber:', streamNumber
-            print 'ripe', ripe.encode('hex')
-            print 'publicSigningKey in hex:', publicSigningKey.encode('hex')
-            print 'publicEncryptionKey in hex:', publicEncryptionKey.encode('hex')
-            shared.printLock.release()
-
-            t = (ripe,)
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''SELECT usedpersonally FROM pubkeys WHERE hash=? AND usedpersonally='yes' ''')
-            shared.sqlSubmitQueue.put(t)
-            queryreturn = shared.sqlReturnQueue.get()
-            shared.sqlLock.release()
-            if queryreturn != []:  # if this pubkey is already in our database and if we have used it personally:
-                print 'We HAVE used this pubkey personally. Updating time.'
-                t = (ripe, data, embeddedTime, 'yes')
-            else:
-                print 'We have NOT used this pubkey personally. Inserting in database.'
-                t = (ripe, data, embeddedTime, 'no')
-                     # This will also update the embeddedTime.
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
-            # shared.workerQueue.put(('newpubkey',(addressVersion,streamNumber,ripe)))
-            self.possibleNewPubkey(ripe)
-
-    # We have received a getpubkey message
-    def recgetpubkey(self, data):
-        if not self.isProofOfWorkSufficient(data):
-            print 'Proof of work in getpubkey message insufficient.'
-            return
-        if len(data) < 34:
-            print 'getpubkey message doesn\'t contain enough data. Ignoring.'
-            return
-        readPosition = 8  # bypass the nonce
-        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
-
-        # This section is used for the transition from 32 bit time to 64 bit
-        # time in the protocol.
-        if embeddedTime == 0:
-            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
-            readPosition += 8
-        else:
-            readPosition += 4
-
-        if embeddedTime > int(time.time()) + 10800:
-            print 'The time in this getpubkey message is too new. Ignoring it. Time:', embeddedTime
-            return
-        if embeddedTime < int(time.time()) - maximumAgeOfAnObjectThatIAmWillingToAccept:
-            print 'The time in this getpubkey message is too old. Ignoring it. Time:', embeddedTime
-            return
-        requestedAddressVersionNumber, addressVersionLength = decodeVarint(
-            data[readPosition:readPosition + 10])
-        readPosition += addressVersionLength
-        streamNumber, streamNumberLength = decodeVarint(
-            data[readPosition:readPosition + 10])
-        if streamNumber != self.streamNumber:
-            print 'The streamNumber', streamNumber, 'doesn\'t match our stream number:', self.streamNumber
-            return
-        readPosition += streamNumberLength
-
-        inventoryHash = calculateInventoryHash(data)
-        shared.inventoryLock.acquire()
-        if inventoryHash in shared.inventory:
-            print 'We have already received this getpubkey request. Ignoring it.'
-            shared.inventoryLock.release()
-            return
-        elif isInSqlInventory(inventoryHash):
-            print 'We have already received this getpubkey request (it is stored on disk in the SQL inventory). Ignoring it.'
-            shared.inventoryLock.release()
-            return
-
-        objectType = 'getpubkey'
-        shared.inventory[inventoryHash] = (
-            objectType, self.streamNumber, data, embeddedTime)
-        shared.inventoryLock.release()
-        # This getpubkey request is valid so far. Forward to peers.
-        self.broadcastinv(inventoryHash)
-
-        if requestedAddressVersionNumber == 0:
-            print 'The requestedAddressVersionNumber of the pubkey request is zero. That doesn\'t make any sense. Ignoring it.'
-            return
-        elif requestedAddressVersionNumber == 1:
-            print 'The requestedAddressVersionNumber of the pubkey request is 1 which isn\'t supported anymore. Ignoring it.'
-            return
-        elif requestedAddressVersionNumber > 3:
-            print 'The requestedAddressVersionNumber of the pubkey request is too high. Can\'t understand. Ignoring it.'
-            return
-
-        requestedHash = data[readPosition:readPosition + 20]
-        if len(requestedHash) != 20:
-            print 'The length of the requested hash is not 20 bytes. Something is wrong. Ignoring.'
-            return
-        print 'the hash requested in this getpubkey request is:', requestedHash.encode('hex')
-
-        if requestedHash in shared.myAddressesByHash:  # if this address hash is one of mine
-            if decodeAddress(shared.myAddressesByHash[requestedHash])[1] != requestedAddressVersionNumber:
-                shared.printLock.acquire()
-                sys.stderr.write(
-                    '(Within the recgetpubkey function) Someone requested one of my pubkeys but the requestedAddressVersionNumber doesn\'t match my actual address version number. That shouldn\'t have happened. Ignoring.\n')
-                shared.printLock.release()
-                return
-            try:
-                lastPubkeySendTime = int(shared.config.get(
-                    shared.myAddressesByHash[requestedHash], 'lastpubkeysendtime'))
-            except:
-                lastPubkeySendTime = 0
-            if lastPubkeySendTime < time.time() - lengthOfTimeToHoldOnToAllPubkeys:  # If the last time we sent our pubkey was 28 days ago
-                shared.printLock.acquire()
-                print 'Found getpubkey-requested-hash in my list of EC hashes. Telling Worker thread to do the POW for a pubkey message and send it out.'
-                shared.printLock.release()
-                if requestedAddressVersionNumber == 2:
-                    shared.workerQueue.put((
-                        'doPOWForMyV2Pubkey', requestedHash))
-                elif requestedAddressVersionNumber == 3:
-                    shared.workerQueue.put((
-                        'doPOWForMyV3Pubkey', requestedHash))
-            else:
-                shared.printLock.acquire()
-                print 'Found getpubkey-requested-hash in my list of EC hashes BUT we already sent it recently. Ignoring request. The lastPubkeySendTime is:', lastPubkeySendTime
-                shared.printLock.release()
-        else:
-            shared.printLock.acquire()
-            print 'This getpubkey request is not for any of my keys.'
-            shared.printLock.release()
-
-    # We have received an inv message
-    def recinv(self, data):
-        totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = 0  # ..from all peers, counting duplicates seperately (because they take up memory)
-        if len(numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer) > 0:
-            for key, value in numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer.items():
-                totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave += value
-            shared.printLock.acquire()
-            print 'number of keys(hosts) in numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer:', len(numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer)
-            print 'totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = ', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave
-            shared.printLock.release()
-        numberOfItemsInInv, lengthOfVarint = decodeVarint(data[:10])
-        if numberOfItemsInInv > 50000:
-            sys.stderr.write('Too many items in inv message!')
-            return
-        if len(data) < lengthOfVarint + (numberOfItemsInInv * 32):
-            print 'inv message doesn\'t contain enough data. Ignoring.'
-            return
-        if numberOfItemsInInv == 1:  # we'll just request this data from the person who advertised the object.
-            if totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave > 200000 and len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 1000:  # inv flooding attack mitigation
-                shared.printLock.acquire()
-                print 'We already have', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 'items yet to retrieve from peers and over 1000 from this node in particular. Ignoring this inv message.'
-                shared.printLock.release()
-                return
-            self.objectsOfWhichThisRemoteNodeIsAlreadyAware[
-                data[lengthOfVarint:32 + lengthOfVarint]] = 0
-            if data[lengthOfVarint:32 + lengthOfVarint] in shared.inventory:
-                shared.printLock.acquire()
-                print 'Inventory (in memory) has inventory item already.'
-                shared.printLock.release()
-            elif isInSqlInventory(data[lengthOfVarint:32 + lengthOfVarint]):
-                print 'Inventory (SQL on disk) has inventory item already.'
-            else:
-                self.sendgetdata(data[lengthOfVarint:32 + lengthOfVarint])
-        else:
-            print 'inv message lists', numberOfItemsInInv, 'objects.'
-            for i in range(numberOfItemsInInv):  # upon finishing dealing with an incoming message, the receiveDataThread will request a random object from the peer. This way if we get multiple inv messages from multiple peers which list mostly the same objects, we will make getdata requests for different random objects from the various peers.
-                if len(data[lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]) == 32:  # The length of an inventory hash should be 32. If it isn't 32 then the remote node is either badly programmed or behaving nefariously.
-                    if totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave > 200000 and len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 1000:  # inv flooding attack mitigation
-                        shared.printLock.acquire()
-                        print 'We already have', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 'items yet to retrieve from peers and over', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave), 'from this node in particular. Ignoring the rest of this inv message.'
-                        shared.printLock.release()
-                        break
-                    self.objectsOfWhichThisRemoteNodeIsAlreadyAware[data[
-                        lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]] = 0
-                    self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[
-                        data[lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]] = 0
-            numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[
-                self.HOST] = len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)
-
-    # Send a getdata message to our peer to request the object with the given
-    # hash
-    def sendgetdata(self, hash):
-        shared.printLock.acquire()
-        print 'sending getdata to retrieve object with hash:', hash.encode('hex')
-        shared.printLock.release()
-        payload = '\x01' + hash
-        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
-        headerData += 'getdata\x00\x00\x00\x00\x00'
-        headerData += pack('>L', len(
-            payload))  # payload length. Note that we add an extra 8 for the nonce.
-        headerData += hashlib.sha512(payload).digest()[:4]
-        try:
-            self.sock.sendall(headerData + payload)
-        except Exception as err:
-            # if not 'Bad file descriptor' in err:
-            shared.printLock.acquire()
-            sys.stderr.write('sock.sendall error: %s\n' % err)
-            shared.printLock.release()
-
-    # We have received a getdata request from our peer
-    def recgetdata(self, data):
-        numberOfRequestedInventoryItems, lengthOfVarint = decodeVarint(
-            data[:10])
-        if len(data) < lengthOfVarint + (32 * numberOfRequestedInventoryItems):
-            print 'getdata message does not contain enough data. Ignoring.'
-            return
-        for i in xrange(numberOfRequestedInventoryItems):
-            hash = data[lengthOfVarint + (
-                i * 32):32 + lengthOfVarint + (i * 32)]
-            shared.printLock.acquire()
-            print 'received getdata request for item:', hash.encode('hex')
-            shared.printLock.release()
-            # print 'inventory is', shared.inventory
-            if hash in shared.inventory:
-                objectType, streamNumber, payload, receivedTime = shared.inventory[
-                    hash]
-                self.sendData(objectType, payload)
-            else:
-                t = (hash,)
-                shared.sqlLock.acquire()
-                shared.sqlSubmitQueue.put(
-                    '''select objecttype, payload from inventory where hash=?''')
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlLock.release()
-                if queryreturn != []:
-                    for row in queryreturn:
-                        objectType, payload = row
-                    self.sendData(objectType, payload)
-                else:
-                    print 'Someone asked for an object with a getdata which is not in either our memory inventory or our SQL inventory. That shouldn\'t have happened.'
-
-    # Our peer has requested (in a getdata message) that we send an object.
-    def sendData(self, objectType, payload):
-        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
-        if objectType == 'pubkey':
-            shared.printLock.acquire()
-            print 'sending pubkey'
-            shared.printLock.release()
-            headerData += 'pubkey\x00\x00\x00\x00\x00\x00'
-        elif objectType == 'getpubkey' or objectType == 'pubkeyrequest':
-            shared.printLock.acquire()
-            print 'sending getpubkey'
-            shared.printLock.release()
-            headerData += 'getpubkey\x00\x00\x00'
-        elif objectType == 'msg':
-            shared.printLock.acquire()
-            print 'sending msg'
-            shared.printLock.release()
-            headerData += 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-        elif objectType == 'broadcast':
-            shared.printLock.acquire()
-            print 'sending broadcast'
-            shared.printLock.release()
-            headerData += 'broadcast\x00\x00\x00'
-        else:
-            sys.stderr.write(
-                'Error: sendData has been asked to send a strange objectType: %s\n' % str(objectType))
-            return
-        headerData += pack('>L', len(payload))  # payload length.
-        headerData += hashlib.sha512(payload).digest()[:4]
-        try:
-            self.sock.sendall(headerData + payload)
-        except Exception as err:
-            # if not 'Bad file descriptor' in err:
-            shared.printLock.acquire()
-            sys.stderr.write('sock.sendall error: %s\n' % err)
-            shared.printLock.release()
-
-    # Send an inv message with just one hash to all of our peers
-    def broadcastinv(self, hash):
-        shared.printLock.acquire()
-        print 'broadcasting inv with hash:', hash.encode('hex')
-        shared.printLock.release()
-        shared.broadcastToSendDataQueues((self.streamNumber, 'sendinv', hash))
-
-    # We have received an addr message.
-    def recaddr(self, data):
-        listOfAddressDetailsToBroadcastToPeers = []
-        numberOfAddressesIncluded = 0
-        numberOfAddressesIncluded, lengthOfNumberOfAddresses = decodeVarint(
-            data[:10])
-
-        if verbose >= 1:
-            shared.printLock.acquire()
-            print 'addr message contains', numberOfAddressesIncluded, 'IP addresses.'
-            shared.printLock.release()
-
-        if self.remoteProtocolVersion == 1:
-            if numberOfAddressesIncluded > 1000 or numberOfAddressesIncluded == 0:
-                return
-            if len(data) != lengthOfNumberOfAddresses + (34 * numberOfAddressesIncluded):
-                print 'addr message does not contain the correct amount of data. Ignoring.'
-                return
-
-            needToWriteKnownNodesToDisk = False
-            for i in range(0, numberOfAddressesIncluded):
-                try:
-                    if data[16 + lengthOfNumberOfAddresses + (34 * i):28 + lengthOfNumberOfAddresses + (34 * i)] != '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF':
-                        shared.printLock.acquire()
-                        print 'Skipping IPv6 address.', repr(data[16 + lengthOfNumberOfAddresses + (34 * i):28 + lengthOfNumberOfAddresses + (34 * i)])
-                        shared.printLock.release()
-                        continue
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write(
-                        'ERROR TRYING TO UNPACK recaddr (to test for an IPv6 address). Message: %s\n' % str(err))
-                    shared.printLock.release()
-                    break  # giving up on unpacking any more. We should still be connected however.
-
-                try:
-                    recaddrStream, = unpack('>I', data[4 + lengthOfNumberOfAddresses + (
-                        34 * i):8 + lengthOfNumberOfAddresses + (34 * i)])
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write(
-                        'ERROR TRYING TO UNPACK recaddr (recaddrStream). Message: %s\n' % str(err))
-                    shared.printLock.release()
-                    break  # giving up on unpacking any more. We should still be connected however.
-                if recaddrStream == 0:
-                    continue
-                if recaddrStream != self.streamNumber and recaddrStream != (self.streamNumber * 2) and recaddrStream != ((self.streamNumber * 2) + 1):  # if the embedded stream number is not in my stream or either of my child streams then ignore it. Someone might be trying funny business.
-                    continue
-                try:
-                    recaddrServices, = unpack('>Q', data[8 + lengthOfNumberOfAddresses + (
-                        34 * i):16 + lengthOfNumberOfAddresses + (34 * i)])
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write(
-                        'ERROR TRYING TO UNPACK recaddr (recaddrServices). Message: %s\n' % str(err))
-                    shared.printLock.release()
-                    break  # giving up on unpacking any more. We should still be connected however.
-
-                try:
-                    recaddrPort, = unpack('>H', data[32 + lengthOfNumberOfAddresses + (
-                        34 * i):34 + lengthOfNumberOfAddresses + (34 * i)])
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write(
-                        'ERROR TRYING TO UNPACK recaddr (recaddrPort). Message: %s\n' % str(err))
-                    shared.printLock.release()
-                    break  # giving up on unpacking any more. We should still be connected however.
-                # print 'Within recaddr(): IP', recaddrIP, ', Port',
-                # recaddrPort, ', i', i
-                hostFromAddrMessage = socket.inet_ntoa(data[
-                                                       28 + lengthOfNumberOfAddresses + (34 * i):32 + lengthOfNumberOfAddresses + (34 * i)])
-                # print 'hostFromAddrMessage', hostFromAddrMessage
-                if data[28 + lengthOfNumberOfAddresses + (34 * i)] == '\x7F':
-                    print 'Ignoring IP address in loopback range:', hostFromAddrMessage
-                    continue
-                if isHostInPrivateIPRange(hostFromAddrMessage):
-                    print 'Ignoring IP address in private range:', hostFromAddrMessage
-                    continue
-                timeSomeoneElseReceivedMessageFromThisNode, = unpack('>I', data[lengthOfNumberOfAddresses + (
-                    34 * i):4 + lengthOfNumberOfAddresses + (34 * i)])  # This is the 'time' value in the received addr message.
-                if recaddrStream not in shared.knownNodes:  # knownNodes is a dictionary of dictionaries with one outer dictionary for each stream. If the outer stream dictionary doesn't exist yet then we must make it.
-                    shared.knownNodesLock.acquire()
-                    shared.knownNodes[recaddrStream] = {}
-                    shared.knownNodesLock.release()
-                if hostFromAddrMessage not in shared.knownNodes[recaddrStream]:
-                    if len(shared.knownNodes[recaddrStream]) < 20000 and timeSomeoneElseReceivedMessageFromThisNode > (int(time.time()) - 10800) and timeSomeoneElseReceivedMessageFromThisNode < (int(time.time()) + 10800):  # If we have more than 20000 nodes in our list already then just forget about adding more. Also, make sure that the time that someone else received a message from this node is within three hours from now.
-                        shared.knownNodesLock.acquire()
-                        shared.knownNodes[recaddrStream][hostFromAddrMessage] = (
-                            recaddrPort, timeSomeoneElseReceivedMessageFromThisNode)
-                        shared.knownNodesLock.release()
-                        needToWriteKnownNodesToDisk = True
-                        hostDetails = (
-                            timeSomeoneElseReceivedMessageFromThisNode,
-                            recaddrStream, recaddrServices, hostFromAddrMessage, recaddrPort)
-                        listOfAddressDetailsToBroadcastToPeers.append(
-                            hostDetails)
-                else:
-                    PORT, timeLastReceivedMessageFromThisNode = shared.knownNodes[recaddrStream][
-                        hostFromAddrMessage]  # PORT in this case is either the port we used to connect to the remote node, or the port that was specified by someone else in a past addr message.
-                    if (timeLastReceivedMessageFromThisNode < timeSomeoneElseReceivedMessageFromThisNode) and (timeSomeoneElseReceivedMessageFromThisNode < int(time.time())):
-                        shared.knownNodesLock.acquire()
-                        shared.knownNodes[recaddrStream][hostFromAddrMessage] = (
-                            PORT, timeSomeoneElseReceivedMessageFromThisNode)
-                        shared.knownNodesLock.release()
-                        if PORT != recaddrPort:
-                            print 'Strange occurance: The port specified in an addr message', str(recaddrPort), 'does not match the port', str(PORT), 'that this program (or some other peer) used to connect to it', str(hostFromAddrMessage), '. Perhaps they changed their port or are using a strange NAT configuration.'
-            if needToWriteKnownNodesToDisk:  # Runs if any nodes were new to us. Also, share those nodes with our peers.
-                shared.knownNodesLock.acquire()
-                output = open(shared.appdata + 'knownnodes.dat', 'wb')
-                pickle.dump(shared.knownNodes, output)
-                output.close()
-                shared.knownNodesLock.release()
-                self.broadcastaddr(
-                    listOfAddressDetailsToBroadcastToPeers)  # no longer broadcast
-            shared.printLock.acquire()
-            print 'knownNodes currently has', len(shared.knownNodes[self.streamNumber]), 'nodes for this stream.'
-            shared.printLock.release()
-        elif self.remoteProtocolVersion >= 2:  # The difference is that in protocol version 2, network addresses use 64 bit times rather than 32 bit times.
-            if numberOfAddressesIncluded > 1000 or numberOfAddressesIncluded == 0:
-                return
-            if len(data) != lengthOfNumberOfAddresses + (38 * numberOfAddressesIncluded):
-                print 'addr message does not contain the correct amount of data. Ignoring.'
-                return
-
-            needToWriteKnownNodesToDisk = False
-            for i in range(0, numberOfAddressesIncluded):
-                try:
-                    if data[20 + lengthOfNumberOfAddresses + (38 * i):32 + lengthOfNumberOfAddresses + (38 * i)] != '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF':
-                        shared.printLock.acquire()
-                        print 'Skipping IPv6 address.', repr(data[20 + lengthOfNumberOfAddresses + (38 * i):32 + lengthOfNumberOfAddresses + (38 * i)])
-                        shared.printLock.release()
-                        continue
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write(
-                        'ERROR TRYING TO UNPACK recaddr (to test for an IPv6 address). Message: %s\n' % str(err))
-                    shared.printLock.release()
-                    break  # giving up on unpacking any more. We should still be connected however.
-
-                try:
-                    recaddrStream, = unpack('>I', data[8 + lengthOfNumberOfAddresses + (
-                        38 * i):12 + lengthOfNumberOfAddresses + (38 * i)])
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write(
-                        'ERROR TRYING TO UNPACK recaddr (recaddrStream). Message: %s\n' % str(err))
-                    shared.printLock.release()
-                    break  # giving up on unpacking any more. We should still be connected however.
-                if recaddrStream == 0:
-                    continue
-                if recaddrStream != self.streamNumber and recaddrStream != (self.streamNumber * 2) and recaddrStream != ((self.streamNumber * 2) + 1):  # if the embedded stream number is not in my stream or either of my child streams then ignore it. Someone might be trying funny business.
-                    continue
-                try:
-                    recaddrServices, = unpack('>Q', data[12 + lengthOfNumberOfAddresses + (
-                        38 * i):20 + lengthOfNumberOfAddresses + (38 * i)])
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write(
-                        'ERROR TRYING TO UNPACK recaddr (recaddrServices). Message: %s\n' % str(err))
-                    shared.printLock.release()
-                    break  # giving up on unpacking any more. We should still be connected however.
-
-                try:
-                    recaddrPort, = unpack('>H', data[36 + lengthOfNumberOfAddresses + (
-                        38 * i):38 + lengthOfNumberOfAddresses + (38 * i)])
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write(
-                        'ERROR TRYING TO UNPACK recaddr (recaddrPort). Message: %s\n' % str(err))
-                    shared.printLock.release()
-                    break  # giving up on unpacking any more. We should still be connected however.
-                # print 'Within recaddr(): IP', recaddrIP, ', Port',
-                # recaddrPort, ', i', i
-                hostFromAddrMessage = socket.inet_ntoa(data[
-                                                       32 + lengthOfNumberOfAddresses + (38 * i):36 + lengthOfNumberOfAddresses + (38 * i)])
-                # print 'hostFromAddrMessage', hostFromAddrMessage
-                if data[32 + lengthOfNumberOfAddresses + (38 * i)] == '\x7F':
-                    print 'Ignoring IP address in loopback range:', hostFromAddrMessage
-                    continue
-                if data[32 + lengthOfNumberOfAddresses + (38 * i)] == '\x0A':
-                    print 'Ignoring IP address in private range:', hostFromAddrMessage
-                    continue
-                if data[32 + lengthOfNumberOfAddresses + (38 * i):34 + lengthOfNumberOfAddresses + (38 * i)] == '\xC0A8':
-                    print 'Ignoring IP address in private range:', hostFromAddrMessage
-                    continue
-                timeSomeoneElseReceivedMessageFromThisNode, = unpack('>Q', data[lengthOfNumberOfAddresses + (
-                    38 * i):8 + lengthOfNumberOfAddresses + (38 * i)])  # This is the 'time' value in the received addr message. 64-bit.
-                if recaddrStream not in shared.knownNodes:  # knownNodes is a dictionary of dictionaries with one outer dictionary for each stream. If the outer stream dictionary doesn't exist yet then we must make it.
-                    shared.knownNodesLock.acquire()
-                    shared.knownNodes[recaddrStream] = {}
-                    shared.knownNodesLock.release()
-                if hostFromAddrMessage not in shared.knownNodes[recaddrStream]:
-                    if len(shared.knownNodes[recaddrStream]) < 20000 and timeSomeoneElseReceivedMessageFromThisNode > (int(time.time()) - 10800) and timeSomeoneElseReceivedMessageFromThisNode < (int(time.time()) + 10800):  # If we have more than 20000 nodes in our list already then just forget about adding more. Also, make sure that the time that someone else received a message from this node is within three hours from now.
-                        shared.knownNodesLock.acquire()
-                        shared.knownNodes[recaddrStream][hostFromAddrMessage] = (
-                            recaddrPort, timeSomeoneElseReceivedMessageFromThisNode)
-                        shared.knownNodesLock.release()
-                        shared.printLock.acquire()
-                        print 'added new node', hostFromAddrMessage, 'to knownNodes in stream', recaddrStream
-                        shared.printLock.release()
-                        needToWriteKnownNodesToDisk = True
-                        hostDetails = (
-                            timeSomeoneElseReceivedMessageFromThisNode,
-                            recaddrStream, recaddrServices, hostFromAddrMessage, recaddrPort)
-                        listOfAddressDetailsToBroadcastToPeers.append(
-                            hostDetails)
-                else:
-                    PORT, timeLastReceivedMessageFromThisNode = shared.knownNodes[recaddrStream][
-                        hostFromAddrMessage]  # PORT in this case is either the port we used to connect to the remote node, or the port that was specified by someone else in a past addr message.
-                    if (timeLastReceivedMessageFromThisNode < timeSomeoneElseReceivedMessageFromThisNode) and (timeSomeoneElseReceivedMessageFromThisNode < int(time.time())):
-                        shared.knownNodesLock.acquire()
-                        shared.knownNodes[recaddrStream][hostFromAddrMessage] = (
-                            PORT, timeSomeoneElseReceivedMessageFromThisNode)
-                        shared.knownNodesLock.release()
-                        if PORT != recaddrPort:
-                            print 'Strange occurance: The port specified in an addr message', str(recaddrPort), 'does not match the port', str(PORT), 'that this program (or some other peer) used to connect to it', str(hostFromAddrMessage), '. Perhaps they changed their port or are using a strange NAT configuration.'
-            if needToWriteKnownNodesToDisk:  # Runs if any nodes were new to us. Also, share those nodes with our peers.
-                shared.knownNodesLock.acquire()
-                output = open(shared.appdata + 'knownnodes.dat', 'wb')
-                pickle.dump(shared.knownNodes, output)
-                output.close()
-                shared.knownNodesLock.release()
-                self.broadcastaddr(listOfAddressDetailsToBroadcastToPeers)
-            shared.printLock.acquire()
-            print 'knownNodes currently has', len(shared.knownNodes[self.streamNumber]), 'nodes for this stream.'
-            shared.printLock.release()
-
-    # Function runs when we want to broadcast an addr message to all of our
-    # peers. Runs when we learn of nodes that we didn't previously know about
-    # and want to share them with our peers.
-    def broadcastaddr(self, listOfAddressDetailsToBroadcastToPeers):
-        numberOfAddressesInAddrMessage = len(
-            listOfAddressDetailsToBroadcastToPeers)
-        payload = ''
-        for hostDetails in listOfAddressDetailsToBroadcastToPeers:
-            timeLastReceivedMessageFromThisNode, streamNumber, services, host, port = hostDetails
-            payload += pack(
-                '>Q', timeLastReceivedMessageFromThisNode)  # now uses 64-bit time
-            payload += pack('>I', streamNumber)
-            payload += pack(
-                '>q', services)  # service bit flags offered by this node
-            payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
-                socket.inet_aton(host)
-            payload += pack('>H', port)  # remote port
-
-        payload = encodeVarint(numberOfAddressesInAddrMessage) + payload
-        datatosend = '\xE9\xBE\xB4\xD9addr\x00\x00\x00\x00\x00\x00\x00\x00'
-        datatosend = datatosend + pack('>L', len(payload))  # payload length
-        datatosend = datatosend + hashlib.sha512(payload).digest()[0:4]
-        datatosend = datatosend + payload
-
-        if verbose >= 1:
-            shared.printLock.acquire()
-            print 'Broadcasting addr with', numberOfAddressesInAddrMessage, 'entries.'
-            shared.printLock.release()
-        shared.broadcastToSendDataQueues((
-            self.streamNumber, 'sendaddr', datatosend))
-
-    # Send a big addr message to our peer
-    def sendaddr(self):
-        addrsInMyStream = {}
-        addrsInChildStreamLeft = {}
-        addrsInChildStreamRight = {}
-        # print 'knownNodes', shared.knownNodes
-
-        # We are going to share a maximum number of 1000 addrs with our peer.
-        # 500 from this stream, 250 from the left child stream, and 250 from
-        # the right child stream.
-        shared.knownNodesLock.acquire()
-        if len(shared.knownNodes[self.streamNumber]) > 0:
-            for i in range(500):
-                random.seed()
-                HOST, = random.sample(shared.knownNodes[self.streamNumber], 1)
-                if isHostInPrivateIPRange(HOST):
-                    continue
-                addrsInMyStream[HOST] = shared.knownNodes[
-                    self.streamNumber][HOST]
-        if len(shared.knownNodes[self.streamNumber * 2]) > 0:
-            for i in range(250):
-                random.seed()
-                HOST, = random.sample(shared.knownNodes[
-                                      self.streamNumber * 2], 1)
-                if isHostInPrivateIPRange(HOST):
-                    continue
-                addrsInChildStreamLeft[HOST] = shared.knownNodes[
-                    self.streamNumber * 2][HOST]
-        if len(shared.knownNodes[(self.streamNumber * 2) + 1]) > 0:
-            for i in range(250):
-                random.seed()
-                HOST, = random.sample(shared.knownNodes[
-                                      (self.streamNumber * 2) + 1], 1)
-                if isHostInPrivateIPRange(HOST):
-                    continue
-                addrsInChildStreamRight[HOST] = shared.knownNodes[
-                    (self.streamNumber * 2) + 1][HOST]
-        shared.knownNodesLock.release()
-        numberOfAddressesInAddrMessage = 0
-        payload = ''
-        # print 'addrsInMyStream.items()', addrsInMyStream.items()
-        for HOST, value in addrsInMyStream.items():
-            PORT, timeLastReceivedMessageFromThisNode = value
-            if timeLastReceivedMessageFromThisNode > (int(time.time()) - maximumAgeOfNodesThatIAdvertiseToOthers):  # If it is younger than 3 hours old..
-                numberOfAddressesInAddrMessage += 1
-                payload += pack(
-                    '>Q', timeLastReceivedMessageFromThisNode)  # 64-bit time
-                payload += pack('>I', self.streamNumber)
-                payload += pack(
-                    '>q', 1)  # service bit flags offered by this node
-                payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
-                    socket.inet_aton(HOST)
-                payload += pack('>H', PORT)  # remote port
-        for HOST, value in addrsInChildStreamLeft.items():
-            PORT, timeLastReceivedMessageFromThisNode = value
-            if timeLastReceivedMessageFromThisNode > (int(time.time()) - maximumAgeOfNodesThatIAdvertiseToOthers):  # If it is younger than 3 hours old..
-                numberOfAddressesInAddrMessage += 1
-                payload += pack(
-                    '>Q', timeLastReceivedMessageFromThisNode)  # 64-bit time
-                payload += pack('>I', self.streamNumber * 2)
-                payload += pack(
-                    '>q', 1)  # service bit flags offered by this node
-                payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
-                    socket.inet_aton(HOST)
-                payload += pack('>H', PORT)  # remote port
-        for HOST, value in addrsInChildStreamRight.items():
-            PORT, timeLastReceivedMessageFromThisNode = value
-            if timeLastReceivedMessageFromThisNode > (int(time.time()) - maximumAgeOfNodesThatIAdvertiseToOthers):  # If it is younger than 3 hours old..
-                numberOfAddressesInAddrMessage += 1
-                payload += pack(
-                    '>Q', timeLastReceivedMessageFromThisNode)  # 64-bit time
-                payload += pack('>I', (self.streamNumber * 2) + 1)
-                payload += pack(
-                    '>q', 1)  # service bit flags offered by this node
-                payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
-                    socket.inet_aton(HOST)
-                payload += pack('>H', PORT)  # remote port
-
-        payload = encodeVarint(numberOfAddressesInAddrMessage) + payload
-        datatosend = '\xE9\xBE\xB4\xD9addr\x00\x00\x00\x00\x00\x00\x00\x00'
-        datatosend = datatosend + pack('>L', len(payload))  # payload length
-        datatosend = datatosend + hashlib.sha512(payload).digest()[0:4]
-        datatosend = datatosend + payload
-        try:
-            self.sock.sendall(datatosend)
-            if verbose >= 1:
-                shared.printLock.acquire()
-                print 'Sending addr with', numberOfAddressesInAddrMessage, 'entries.'
-                shared.printLock.release()
-        except Exception as err:
-            # if not 'Bad file descriptor' in err:
-            shared.printLock.acquire()
-            sys.stderr.write('sock.sendall error: %s\n' % err)
-            shared.printLock.release()
-
-    # We have received a version message
-    def recversion(self, data):
-        if len(data) < 83:
-            # This version message is unreasonably short. Forget it.
-            return
-        elif not self.verackSent:
-            self.remoteProtocolVersion, = unpack('>L', data[:4])
-            if self.remoteProtocolVersion <= 1:
-                shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
-                shared.printLock.acquire()
-                print 'Closing connection to old protocol version 1 node: ', self.HOST
-                shared.printLock.release()
-                return
-            # print 'remoteProtocolVersion', self.remoteProtocolVersion
-            self.myExternalIP = socket.inet_ntoa(data[40:44])
-            # print 'myExternalIP', self.myExternalIP
-            self.remoteNodeIncomingPort, = unpack('>H', data[70:72])
-            # print 'remoteNodeIncomingPort', self.remoteNodeIncomingPort
-            useragentLength, lengthOfUseragentVarint = decodeVarint(
-                data[80:84])
-            readPosition = 80 + lengthOfUseragentVarint
-            useragent = data[readPosition:readPosition + useragentLength]
-            readPosition += useragentLength
-            numberOfStreamsInVersionMessage, lengthOfNumberOfStreamsInVersionMessage = decodeVarint(
-                data[readPosition:])
-            readPosition += lengthOfNumberOfStreamsInVersionMessage
-            self.streamNumber, lengthOfRemoteStreamNumber = decodeVarint(
-                data[readPosition:])
-            shared.printLock.acquire()
-            print 'Remote node useragent:', useragent, '  stream number:', self.streamNumber
-            shared.printLock.release()
-            if self.streamNumber != 1:
-                shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
-                shared.printLock.acquire()
-                print 'Closed connection to', self.HOST, 'because they are interested in stream', self.streamNumber, '.'
-                shared.printLock.release()
-                return
-            shared.connectedHostsList[
-                self.HOST] = 1  # We use this data structure to not only keep track of what hosts we are connected to so that we don't try to connect to them again, but also to list the connections count on the Network Status tab.
-            # If this was an incoming connection, then the sendData thread
-            # doesn't know the stream. We have to set it.
-            if not self.initiatedConnection:
-                shared.broadcastToSendDataQueues((
-                    0, 'setStreamNumber', (self.HOST, self.streamNumber)))
-            if data[72:80] == eightBytesOfRandomDataUsedToDetectConnectionsToSelf:
-                shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
-                shared.printLock.acquire()
-                print 'Closing connection to myself: ', self.HOST
-                shared.printLock.release()
-                return
-            shared.broadcastToSendDataQueues((0, 'setRemoteProtocolVersion', (
-                self.HOST, self.remoteProtocolVersion)))
-
-            shared.knownNodesLock.acquire()
-            shared.knownNodes[self.streamNumber][self.HOST] = (
-                self.remoteNodeIncomingPort, int(time.time()))
-            output = open(shared.appdata + 'knownnodes.dat', 'wb')
-            pickle.dump(shared.knownNodes, output)
-            output.close()
-            shared.knownNodesLock.release()
-
-            self.sendverack()
-            if self.initiatedConnection == False:
-                self.sendversion()
-
-    # Sends a version message
-    def sendversion(self):
-        shared.printLock.acquire()
-        print 'Sending version message'
-        shared.printLock.release()
-        try:
-            self.sock.sendall(assembleVersionMessage(
-                self.HOST, self.PORT, self.streamNumber))
-        except Exception as err:
-            # if not 'Bad file descriptor' in err:
-            shared.printLock.acquire()
-            sys.stderr.write('sock.sendall error: %s\n' % err)
-            shared.printLock.release()
-
-    # Sends a verack message
-    def sendverack(self):
-        shared.printLock.acquire()
-        print 'Sending verack'
-        shared.printLock.release()
-        try:
-            self.sock.sendall(
-                '\xE9\xBE\xB4\xD9\x76\x65\x72\x61\x63\x6B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35')
-        except Exception as err:
-            # if not 'Bad file descriptor' in err:
-            shared.printLock.acquire()
-            sys.stderr.write('sock.sendall error: %s\n' % err)
-            shared.printLock.release()
-                                                                                                             # cf
-                                                                                                             # 83
-                                                                                                             # e1
-                                                                                                             # 35
-        self.verackSent = True
-        if self.verackReceived:
-            self.connectionFullyEstablished()
-
-
-# Every connection to a peer has a sendDataThread (and also a
-# receiveDataThread).
-class sendDataThread(threading.Thread):
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self.mailbox = Queue.Queue()
-        shared.sendDataQueues.append(self.mailbox)
-        shared.printLock.acquire()
-        print 'The length of sendDataQueues at sendDataThread init is:', len(shared.sendDataQueues)
-        shared.printLock.release()
-        self.data = ''
-
-    def setup(
-        self,
-        sock,
-        HOST,
-        PORT,
-        streamNumber,
-            objectsOfWhichThisRemoteNodeIsAlreadyAware):
-        self.sock = sock
-        self.HOST = HOST
-        self.PORT = PORT
-        self.streamNumber = streamNumber
-        self.remoteProtocolVersion = - \
-            1  # This must be set using setRemoteProtocolVersion command which is sent through the self.mailbox queue.
-        self.lastTimeISentData = int(
-            time.time())  # If this value increases beyond five minutes ago, we'll send a pong message to keep the connection alive.
-        self.objectsOfWhichThisRemoteNodeIsAlreadyAware = objectsOfWhichThisRemoteNodeIsAlreadyAware
-        shared.printLock.acquire()
-        print 'The streamNumber of this sendDataThread (ID:', str(id(self)) + ') at setup() is', self.streamNumber
-        shared.printLock.release()
-
-    def sendVersionMessage(self):
-        datatosend = assembleVersionMessage(
-            self.HOST, self.PORT, self.streamNumber)  # the IP and port of the remote host, and my streamNumber.
-
-        shared.printLock.acquire()
-        print 'Sending version packet: ', repr(datatosend)
-        shared.printLock.release()
-        try:
-            self.sock.sendall(datatosend)
-        except Exception as err:
-            # if not 'Bad file descriptor' in err:
-            shared.printLock.acquire()
-            sys.stderr.write('sock.sendall error: %s\n' % err)
-            shared.printLock.release()
-        self.versionSent = 1
-
-    def run(self):
-        while True:
-            deststream, command, data = self.mailbox.get()
-            # shared.printLock.acquire()
-            # print 'sendDataThread, destream:', deststream, ', Command:', command, ', ID:',id(self), ', HOST:', self.HOST
-            # shared.printLock.release()
-
-            if deststream == self.streamNumber or deststream == 0:
-                if command == 'shutdown':
-                    if data == self.HOST or data == 'all':
-                        shared.printLock.acquire()
-                        print 'sendDataThread (associated with', self.HOST, ') ID:', id(self), 'shutting down now.'
-                        shared.printLock.release()
-                        try:
-                            self.sock.shutdown(socket.SHUT_RDWR)
-                            self.sock.close()
-                        except:
-                            pass
-                        shared.sendDataQueues.remove(self.mailbox)
-                        shared.printLock.acquire()
-                        print 'len of sendDataQueues', len(shared.sendDataQueues)
-                        shared.printLock.release()
-                        break
-                # When you receive an incoming connection, a sendDataThread is
-                # created even though you don't yet know what stream number the
-                # remote peer is interested in. They will tell you in a version
-                # message and if you too are interested in that stream then you
-                # will continue on with the connection and will set the
-                # streamNumber of this send data thread here:
-                elif command == 'setStreamNumber':
-                    hostInMessage, specifiedStreamNumber = data
-                    if hostInMessage == self.HOST:
-                        shared.printLock.acquire()
-                        print 'setting the stream number in the sendData thread (ID:', id(self), ') to', specifiedStreamNumber
-                        shared.printLock.release()
-                        self.streamNumber = specifiedStreamNumber
-                elif command == 'setRemoteProtocolVersion':
-                    hostInMessage, specifiedRemoteProtocolVersion = data
-                    if hostInMessage == self.HOST:
-                        shared.printLock.acquire()
-                        print 'setting the remote node\'s protocol version in the sendData thread (ID:', id(self), ') to', specifiedRemoteProtocolVersion
-                        shared.printLock.release()
-                        self.remoteProtocolVersion = specifiedRemoteProtocolVersion
-                elif command == 'sendaddr':
-                    try:
-                        # To prevent some network analysis, 'leak' the data out
-                        # to our peer after waiting a random amount of time
-                        # unless we have a long list of messages in our queue
-                        # to send.
-                        random.seed()
-                        time.sleep(random.randrange(0, 10))
-                        self.sock.sendall(data)
-                        self.lastTimeISentData = int(time.time())
-                    except:
-                        print 'self.sock.sendall failed'
-                        try:
-                            self.sock.shutdown(socket.SHUT_RDWR)
-                            self.sock.close()
-                        except:
-                            pass
-                        shared.sendDataQueues.remove(self.mailbox)
-                        print 'sendDataThread thread (ID:', str(id(self)) + ') ending now. Was connected to', self.HOST
-                        break
-                elif command == 'sendinv':
-                    if data not in self.objectsOfWhichThisRemoteNodeIsAlreadyAware:
-                        payload = '\x01' + data
-                        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
-                        headerData += 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-                        headerData += pack('>L', len(payload))
-                        headerData += hashlib.sha512(payload).digest()[:4]
-                        # To prevent some network analysis, 'leak' the data out
-                        # to our peer after waiting a random amount of time
-                        random.seed()
-                        time.sleep(random.randrange(0, 10))
-                        try:
-                            self.sock.sendall(headerData + payload)
-                            self.lastTimeISentData = int(time.time())
-                        except:
-                            print 'self.sock.sendall failed'
-                            try:
-                                self.sock.shutdown(socket.SHUT_RDWR)
-                                self.sock.close()
-                            except:
-                                pass
-                            shared.sendDataQueues.remove(self.mailbox)
-                            print 'sendDataThread thread (ID:', str(id(self)) + ') ending now. Was connected to', self.HOST
-                            break
-                elif command == 'pong':
-                    if self.lastTimeISentData < (int(time.time()) - 298):
-                        # Send out a pong message to keep the connection alive.
-                        shared.printLock.acquire()
-                        print 'Sending pong to', self.HOST, 'to keep connection alive.'
-                        shared.printLock.release()
-                        try:
-                            self.sock.sendall(
-                                '\xE9\xBE\xB4\xD9\x70\x6F\x6E\x67\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35')
-                            self.lastTimeISentData = int(time.time())
-                        except:
-                            print 'send pong failed'
-                            try:
-                                self.sock.shutdown(socket.SHUT_RDWR)
-                                self.sock.close()
-                            except:
-                                pass
-                            shared.sendDataQueues.remove(self.mailbox)
-                            print 'sendDataThread thread', self, 'ending now. Was connected to', self.HOST
-                            break
-            else:
-                shared.printLock.acquire()
-                print 'sendDataThread ID:', id(self), 'ignoring command', command, 'because the thread is not in stream', deststream
-                shared.printLock.release()
-
-
-def isInSqlInventory(hash):
-    t = (hash,)
-    shared.sqlLock.acquire()
-    shared.sqlSubmitQueue.put('''select hash from inventory where hash=?''')
-    shared.sqlSubmitQueue.put(t)
-    queryreturn = shared.sqlReturnQueue.get()
-    shared.sqlLock.release()
-    if queryreturn == []:
-        return False
-    else:
-        return True
-
-
-def convertIntToString(n):
-    a = __builtins__.hex(n)
-    if a[-1:] == 'L':
-        a = a[:-1]
-    if (len(a) % 2) == 0:
-        return a[2:].decode('hex')
-    else:
-        return ('0' + a[2:]).decode('hex')
-
-
-def convertStringToInt(s):
-    return int(s.encode('hex'), 16)
-
-
-# This function expects that pubkey begin with \x04
-def calculateBitcoinAddressFromPubkey(pubkey):
-    if len(pubkey) != 65:
-        print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey), 'bytes long rather than 65.'
-        return "error"
-    ripe = hashlib.new('ripemd160')
-    sha = hashlib.new('sha256')
-    sha.update(pubkey)
-    ripe.update(sha.digest())
-    ripeWithProdnetPrefix = '\x00' + ripe.digest()
-
-    checksum = hashlib.sha256(hashlib.sha256(
-        ripeWithProdnetPrefix).digest()).digest()[:4]
-    binaryBitcoinAddress = ripeWithProdnetPrefix + checksum
-    numberOfZeroBytesOnBinaryBitcoinAddress = 0
-    while binaryBitcoinAddress[0] == '\x00':
-        numberOfZeroBytesOnBinaryBitcoinAddress += 1
-        binaryBitcoinAddress = binaryBitcoinAddress[1:]
-    base58encoded = arithmetic.changebase(binaryBitcoinAddress, 256, 58)
-    return "1" * numberOfZeroBytesOnBinaryBitcoinAddress + base58encoded
-
-
-def calculateTestnetAddressFromPubkey(pubkey):
-    if len(pubkey) != 65:
-        print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey), 'bytes long rather than 65.'
-        return "error"
-    ripe = hashlib.new('ripemd160')
-    sha = hashlib.new('sha256')
-    sha.update(pubkey)
-    ripe.update(sha.digest())
-    ripeWithProdnetPrefix = '\x6F' + ripe.digest()
-
-    checksum = hashlib.sha256(hashlib.sha256(
-        ripeWithProdnetPrefix).digest()).digest()[:4]
-    binaryBitcoinAddress = ripeWithProdnetPrefix + checksum
-    numberOfZeroBytesOnBinaryBitcoinAddress = 0
-    while binaryBitcoinAddress[0] == '\x00':
-        numberOfZeroBytesOnBinaryBitcoinAddress += 1
-        binaryBitcoinAddress = binaryBitcoinAddress[1:]
-    base58encoded = arithmetic.changebase(binaryBitcoinAddress, 256, 58)
-    return "1" * numberOfZeroBytesOnBinaryBitcoinAddress + base58encoded
-
-
-def signal_handler(signal, frame):
-    if shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'):
-        shared.doCleanShutdown()
         sys.exit(0)
-    else:
-        print 'Unfortunately you cannot use Ctrl+C when running the UI because the UI captures the signal.'
-
 
 def connectToStream(streamNumber):
     selfInitiatedConnections[streamNumber] = {}
@@ -2570,1542 +49,9 @@ def connectToStream(streamNumber):
         maximumNumberOfHalfOpenConnections = 32
     for i in range(maximumNumberOfHalfOpenConnections):
         a = outgoingSynSender()
-        a.setup(streamNumber)
+        a.setup(streamNumber, selfInitiatedConnections)
         a.start()
 
-# Does an EC point multiplication; turns a private key into a public key.
-
-
-def pointMult(secret):
-    # ctx = OpenSSL.BN_CTX_new() #This value proved to cause Seg Faults on
-    # Linux. It turns out that it really didn't speed up EC_POINT_mul anyway.
-    k = OpenSSL.EC_KEY_new_by_curve_name(OpenSSL.get_curve('secp256k1'))
-    priv_key = OpenSSL.BN_bin2bn(secret, 32, 0)
-    group = OpenSSL.EC_KEY_get0_group(k)
-    pub_key = OpenSSL.EC_POINT_new(group)
-
-    OpenSSL.EC_POINT_mul(group, pub_key, priv_key, None, None, None)
-    OpenSSL.EC_KEY_set_private_key(k, priv_key)
-    OpenSSL.EC_KEY_set_public_key(k, pub_key)
-    # print 'priv_key',priv_key
-    # print 'pub_key',pub_key
-
-    size = OpenSSL.i2o_ECPublicKey(k, 0)
-    mb = ctypes.create_string_buffer(size)
-    OpenSSL.i2o_ECPublicKey(k, ctypes.byref(ctypes.pointer(mb)))
-    # print 'mb.raw', mb.raw.encode('hex'), 'length:', len(mb.raw)
-    # print 'mb.raw', mb.raw, 'length:', len(mb.raw)
-
-    OpenSSL.EC_POINT_free(pub_key)
-    # OpenSSL.BN_CTX_free(ctx)
-    OpenSSL.BN_free(priv_key)
-    OpenSSL.EC_KEY_free(k)
-    return mb.raw
-
-
-def assembleVersionMessage(remoteHost, remotePort, myStreamNumber):
-    shared.softwareVersion
-    payload = ''
-    payload += pack('>L', 2)  # protocol version.
-    payload += pack('>q', 1)  # bitflags of the services I offer.
-    payload += pack('>q', int(time.time()))
-
-    payload += pack(
-        '>q', 1)  # boolservices of remote connection. How can I even know this for sure? This is probably ignored by the remote host.
-    payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
-        socket.inet_aton(remoteHost)
-    payload += pack('>H', remotePort)  # remote IPv6 and port
-
-    payload += pack('>q', 1)  # bitflags of the services I offer.
-    payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + pack(
-        '>L', 2130706433)  # = 127.0.0.1. This will be ignored by the remote host. The actual remote connected IP will be used.
-    payload += pack('>H', shared.config.getint(
-        'bitmessagesettings', 'port'))  # my external IPv6 and port
-
-    random.seed()
-    payload += eightBytesOfRandomDataUsedToDetectConnectionsToSelf
-    userAgent = '/PyBitmessage:' + shared.softwareVersion + \
-        '/'  # Length of userAgent must be less than 253.
-    payload += pack('>B', len(
-        userAgent))  # user agent string length. If the user agent is more than 252 bytes long, this code isn't going to work.
-    payload += userAgent
-    payload += encodeVarint(
-        1)  # The number of streams about which I care. PyBitmessage currently only supports 1 per connection.
-    payload += encodeVarint(myStreamNumber)
-
-    datatosend = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
-    datatosend = datatosend + 'version\x00\x00\x00\x00\x00'  # version command
-    datatosend = datatosend + pack('>L', len(payload))  # payload length
-    datatosend = datatosend + hashlib.sha512(payload).digest()[0:4]
-    return datatosend + payload
-
-
-def isHostInPrivateIPRange(host):
-    if host[:3] == '10.':
-        return True
-    if host[:4] == '172.':
-        if host[6] == '.':
-            if int(host[4:6]) >= 16 and int(host[4:6]) <= 31:
-                return True
-    if host[:8] == '192.168.':
-        return True
-    return False
-
-# This thread exists because SQLITE3 is so un-threadsafe that we must
-# submit queries to it and it puts results back in a different queue. They
-# won't let us just use locks.
-
-
-class sqlThread(threading.Thread):
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-
-    def run(self):
-        self.conn = sqlite3.connect(shared.appdata + 'messages.dat')
-        self.conn.text_factory = str
-        self.cur = self.conn.cursor()
-        try:
-            self.cur.execute(
-                '''CREATE TABLE inbox (msgid blob, toaddress text, fromaddress text, subject text, received text, message text, folder text, encodingtype int, read bool, UNIQUE(msgid) ON CONFLICT REPLACE)''' )
-            self.cur.execute(
-                '''CREATE TABLE sent (msgid blob, toaddress text, toripe blob, fromaddress text, subject text, message text, ackdata blob, lastactiontime integer, status text, pubkeyretrynumber integer, msgretrynumber integer, folder text, encodingtype int)''' )
-            self.cur.execute(
-                '''CREATE TABLE subscriptions (label text, address text, enabled bool)''' )
-            self.cur.execute(
-                '''CREATE TABLE addressbook (label text, address text)''' )
-            self.cur.execute(
-                '''CREATE TABLE blacklist (label text, address text, enabled bool)''' )
-            self.cur.execute(
-                '''CREATE TABLE whitelist (label text, address text, enabled bool)''' )
-            # Explanation of what is in the pubkeys table:
-            #   The hash is the RIPEMD160 hash that is encoded in the Bitmessage address.
-            #   transmitdata is literally the data that was included in the Bitmessage pubkey message when it arrived, except for the 24 byte protocol header- ie, it starts with the POW nonce.
-            #   time is the time that the pubkey was broadcast on the network same as with every other type of Bitmessage object.
-            # usedpersonally is set to "yes" if we have used the key
-            # personally. This keeps us from deleting it because we may want to
-            # reply to a message in the future. This field is not a bool
-            # because we may need more flexability in the future and it doesn't
-            # take up much more space anyway.
-            self.cur.execute(
-                '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' )
-            self.cur.execute(
-                '''CREATE TABLE inventory (hash blob, objecttype text, streamnumber int, payload blob, receivedtime integer, UNIQUE(hash) ON CONFLICT REPLACE)''' )
-            self.cur.execute(
-                '''CREATE TABLE knownnodes (timelastseen int, stream int, services blob, host blob, port blob, UNIQUE(host, stream, port) ON CONFLICT REPLACE)''' )
-                             # This table isn't used in the program yet but I
-                             # have a feeling that we'll need it.
-            self.cur.execute(
-                '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
-            self.cur.execute(
-                '''CREATE TABLE settings (key blob, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' )
-            self.cur.execute( '''INSERT INTO settings VALUES('version','1')''')
-            self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
-                int(time.time()),))
-            self.conn.commit()
-            print 'Created messages database file'
-        except Exception as err:
-            if str(err) == 'table inbox already exists':
-                shared.printLock.acquire()
-                print 'Database file already exists.'
-                shared.printLock.release()
-            else:
-                sys.stderr.write(
-                    'ERROR trying to create database file (message.dat). Error message: %s\n' % str(err))
-                os._exit(0)
-
-        # People running earlier versions of PyBitmessage do not have the
-        # usedpersonally field in their pubkeys table. Let's add it.
-        if shared.config.getint('bitmessagesettings', 'settingsversion') == 2:
-            item = '''ALTER TABLE pubkeys ADD usedpersonally text DEFAULT 'no' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
-            self.conn.commit()
-
-            shared.config.set('bitmessagesettings', 'settingsversion', '3')
-            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-                shared.config.write(configfile)
-
-        # People running earlier versions of PyBitmessage do not have the
-        # encodingtype field in their inbox and sent tables or the read field
-        # in the inbox table. Let's add them.
-        if shared.config.getint('bitmessagesettings', 'settingsversion') == 3:
-            item = '''ALTER TABLE inbox ADD encodingtype int DEFAULT '2' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
-
-            item = '''ALTER TABLE inbox ADD read bool DEFAULT '1' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
-
-            item = '''ALTER TABLE sent ADD encodingtype int DEFAULT '2' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
-            self.conn.commit()
-
-            shared.config.set('bitmessagesettings', 'settingsversion', '4')
-            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-                shared.config.write(configfile)
-
-        if shared.config.getint('bitmessagesettings', 'settingsversion') == 4:
-            shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
-                shared.networkDefaultProofOfWorkNonceTrialsPerByte))
-            shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
-                shared.networkDefaultPayloadLengthExtraBytes))
-            shared.config.set('bitmessagesettings', 'settingsversion', '5')
-
-        if shared.config.getint('bitmessagesettings', 'settingsversion') == 5:
-            shared.config.set(
-                'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
-            shared.config.set(
-                'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
-            shared.config.set('bitmessagesettings', 'settingsversion', '6')
-            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-                shared.config.write(configfile)
-
-        # From now on, let us keep a 'version' embedded in the messages.dat
-        # file so that when we make changes to the database, the database
-        # version we are on can stay embedded in the messages.dat file. Let us
-        # check to see if the settings table exists yet.
-        item = '''SELECT name FROM sqlite_master WHERE type='table' AND name='settings';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
-        if self.cur.fetchall() == []:
-            # The settings table doesn't exist. We need to make it.
-            print 'In messages.dat database, creating new \'settings\' table.'
-            self.cur.execute(
-                '''CREATE TABLE settings (key text, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' )
-            self.cur.execute( '''INSERT INTO settings VALUES('version','1')''')
-            self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
-                int(time.time()),))
-            print 'In messages.dat database, removing an obsolete field from the pubkeys table.'
-            self.cur.execute(
-                '''CREATE TEMPORARY TABLE pubkeys_backup(hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE);''')
-            self.cur.execute(
-                '''INSERT INTO pubkeys_backup SELECT hash, transmitdata, time, usedpersonally FROM pubkeys;''')
-            self.cur.execute( '''DROP TABLE pubkeys''')
-            self.cur.execute(
-                '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' )
-            self.cur.execute(
-                '''INSERT INTO pubkeys SELECT hash, transmitdata, time, usedpersonally FROM pubkeys_backup;''')
-            self.cur.execute( '''DROP TABLE pubkeys_backup;''')
-            print 'Deleting all pubkeys from inventory. They will be redownloaded and then saved with the correct times.'
-            self.cur.execute(
-                '''delete from inventory where objecttype = 'pubkey';''')
-            print 'replacing Bitmessage announcements mailing list with a new one.'
-            self.cur.execute(
-                '''delete from subscriptions where address='BM-BbkPSZbzPwpVcYZpU4yHwf9ZPEapN5Zx' ''')
-            self.cur.execute(
-                '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
-            print 'Commiting.'
-            self.conn.commit()
-            print 'Vacuuming message.dat. You might notice that the file size gets much smaller.'
-            self.cur.execute( ''' VACUUM ''')
-
-        # After code refactoring, the possible status values for sent messages
-        # as changed.
-        self.cur.execute(
-            '''update sent set status='doingmsgpow' where status='doingpow'  ''')
-        self.cur.execute(
-            '''update sent set status='msgsent' where status='sentmessage'  ''')
-        self.cur.execute(
-            '''update sent set status='doingpubkeypow' where status='findingpubkey'  ''')
-        self.cur.execute(
-            '''update sent set status='broadcastqueued' where status='broadcastpending'  ''')
-        self.conn.commit()
-
-        try:
-            testpayload = '\x00\x00'
-            t = ('1234', testpayload, '12345678', 'no')
-            self.cur.execute( '''INSERT INTO pubkeys VALUES(?,?,?,?)''', t)
-            self.conn.commit()
-            self.cur.execute(
-                '''SELECT transmitdata FROM pubkeys WHERE hash='1234' ''')
-            queryreturn = self.cur.fetchall()
-            for row in queryreturn:
-                transmitdata, = row
-            self.cur.execute('''DELETE FROM pubkeys WHERE hash='1234' ''')
-            self.conn.commit()
-            if transmitdata == '':
-                sys.stderr.write('Problem: The version of SQLite you have cannot store Null values. Please download and install the latest revision of your version of Python (for example, the latest Python 2.7 revision) and try again.\n')
-                sys.stderr.write('PyBitmessage will now exit very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n')
-                os._exit(0)
-        except Exception as err:
-            print err
-
-        # Let us check to see the last time we vaccumed the messages.dat file.
-        # If it has been more than a month let's do it now.
-        item = '''SELECT value FROM settings WHERE key='lastvacuumtime';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
-        queryreturn = self.cur.fetchall()
-        for row in queryreturn:
-            value, = row
-            if int(value) < int(time.time()) - 2592000:
-                print 'It has been a long time since the messages.dat file has been vacuumed. Vacuuming now...'
-                self.cur.execute( ''' VACUUM ''')
-                item = '''update settings set value=? WHERE key='lastvacuumtime';'''
-                parameters = (int(time.time()),)
-                self.cur.execute(item, parameters)
-
-        while True:
-            item = shared.sqlSubmitQueue.get()
-            if item == 'commit':
-                self.conn.commit()
-            elif item == 'exit':
-                self.conn.close()
-                shared.printLock.acquire()
-                print 'sqlThread exiting gracefully.'
-                shared.printLock.release()
-                return
-            elif item == 'movemessagstoprog':
-                shared.printLock.acquire()
-                print 'the sqlThread is moving the messages.dat file to the local program directory.'
-                shared.printLock.release()
-                self.conn.commit()
-                self.conn.close()
-                shutil.move(
-                    shared.lookupAppdataFolder() + 'messages.dat', 'messages.dat')
-                self.conn = sqlite3.connect('messages.dat')
-                self.conn.text_factory = str
-                self.cur = self.conn.cursor()
-            elif item == 'movemessagstoappdata':
-                shared.printLock.acquire()
-                print 'the sqlThread is moving the messages.dat file to the Appdata folder.'
-                shared.printLock.release()
-                self.conn.commit()
-                self.conn.close()
-                shutil.move(
-                    'messages.dat', shared.lookupAppdataFolder() + 'messages.dat')
-                self.conn = sqlite3.connect(shared.appdata + 'messages.dat')
-                self.conn.text_factory = str
-                self.cur = self.conn.cursor()
-            elif item == 'deleteandvacuume':
-                self.cur.execute('''delete from inbox where folder='trash' ''')
-                self.cur.execute('''delete from sent where folder='trash' ''')
-                self.conn.commit()
-                self.cur.execute( ''' VACUUM ''')
-            else:
-                parameters = shared.sqlSubmitQueue.get()
-                # print 'item', item
-                # print 'parameters', parameters
-                try:
-                    self.cur.execute(item, parameters)
-                except Exception as err:
-                    shared.printLock.acquire()
-                    sys.stderr.write('\nMajor error occurred when trying to execute a SQL statement within the sqlThread. Please tell Atheros about this error message or post it in the forum! Error occurred while trying to execute statement: "' + str(
-                        item) + '"  Here are the parameters; you might want to censor this data with asterisks (***) as it can contain private information: ' + str(repr(parameters)) + '\nHere is the actual error message thrown by the sqlThread: ' + str(err) + '\n')
-                    sys.stderr.write('This program shall now abruptly exit!\n')
-                    shared.printLock.release()
-                    os._exit(0)
-
-                shared.sqlReturnQueue.put(self.cur.fetchall())
-                # shared.sqlSubmitQueue.task_done()
-
-
-'''The singleCleaner class is a timer-driven thread that cleans data structures to free memory, resends messages when a remote node doesn't respond, and sends pong messages to keep connections alive if the network isn't busy.
-It cleans these data structures in memory:
-    inventory (moves data to the on-disk sql database)
-
-It cleans these tables on the disk:
-    inventory (clears data more than 2 days and 12 hours old)
-    pubkeys (clears pubkeys older than 4 weeks old which we have not used personally)
-
-It resends messages when there has been no response:
-    resends getpubkey messages in 4 days (then 8 days, then 16 days, etc...)
-    resends msg messages in 4 days (then 8 days, then 16 days, etc...)
-
-'''
-
-
-class singleCleaner(threading.Thread):
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-
-    def run(self):
-        timeWeLastClearedInventoryAndPubkeysTables = 0
-
-        while True:
-            shared.sqlLock.acquire()
-            shared.UISignalQueue.put((
-                'updateStatusBar', 'Doing housekeeping (Flushing inventory in memory to disk...)'))
-            for hash, storedValue in shared.inventory.items():
-                objectType, streamNumber, payload, receivedTime = storedValue
-                if int(time.time()) - 3600 > receivedTime:
-                    t = (hash, objectType, streamNumber, payload, receivedTime)
-                    shared.sqlSubmitQueue.put(
-                        '''INSERT INTO inventory VALUES (?,?,?,?,?)''')
-                    shared.sqlSubmitQueue.put(t)
-                    shared.sqlReturnQueue.get()
-                    del shared.inventory[hash]
-            shared.sqlSubmitQueue.put('commit')
-            shared.UISignalQueue.put(('updateStatusBar', ''))
-            shared.sqlLock.release()
-            shared.broadcastToSendDataQueues((
-                0, 'pong', 'no data'))  # commands the sendData threads to send out a pong message if they haven't sent anything else in the last five minutes. The socket timeout-time is 10 minutes.
-            # If we are running as a daemon then we are going to fill up the UI
-            # queue which will never be handled by a UI. We should clear it to
-            # save memory.
-            if shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'):
-                shared.UISignalQueue.queue.clear()
-            if timeWeLastClearedInventoryAndPubkeysTables < int(time.time()) - 7380:
-                timeWeLastClearedInventoryAndPubkeysTables = int(time.time())
-                # inventory (moves data from the inventory data structure to
-                # the on-disk sql database)
-                shared.sqlLock.acquire()
-                # inventory (clears pubkeys after 28 days and everything else
-                # after 2 days and 12 hours)
-                t = (int(time.time()) - lengthOfTimeToLeaveObjectsInInventory, int(
-                    time.time()) - lengthOfTimeToHoldOnToAllPubkeys)
-                shared.sqlSubmitQueue.put(
-                    '''DELETE FROM inventory WHERE (receivedtime<? AND objecttype<>'pubkey') OR (receivedtime<?  AND objecttype='pubkey') ''')
-                shared.sqlSubmitQueue.put(t)
-                shared.sqlReturnQueue.get()
-
-                # pubkeys
-                t = (int(time.time()) - lengthOfTimeToHoldOnToAllPubkeys,)
-                shared.sqlSubmitQueue.put(
-                    '''DELETE FROM pubkeys WHERE time<? AND usedpersonally='no' ''')
-                shared.sqlSubmitQueue.put(t)
-                shared.sqlReturnQueue.get()
-                shared.sqlSubmitQueue.put('commit')
-
-                t = ()
-                shared.sqlSubmitQueue.put(
-                    '''select toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber FROM sent WHERE ((status='awaitingpubkey' OR status='msgsent') AND folder='sent') ''')  # If the message's folder='trash' then we'll ignore it.
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                for row in queryreturn:
-                    if len(row) < 5:
-                        shared.printLock.acquire()
-                        sys.stderr.write(
-                            'Something went wrong in the singleCleaner thread: a query did not return the requested fields. ' + repr(row))
-                        time.sleep(3)
-                        shared.printLock.release()
-                        break
-                    toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber = row
-                    if status == 'awaitingpubkey':
-                        if int(time.time()) - lastactiontime > (maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (pubkeyretrynumber))):
-                            print 'It has been a long time and we haven\'t heard a response to our getpubkey request. Sending again.'
-                            try:
-                                del neededPubkeys[
-                                    toripe]  # We need to take this entry out of the neededPubkeys structure because the shared.workerQueue checks to see whether the entry is already present and will not do the POW and send the message because it assumes that it has already done it recently.
-                            except:
-                                pass
-
-                            shared.UISignalQueue.put((
-                                'updateStatusBar', 'Doing work necessary to again attempt to request a public key...'))
-                            t = (int(
-                                time.time()), pubkeyretrynumber + 1, toripe)
-                            shared.sqlSubmitQueue.put(
-                                '''UPDATE sent SET lastactiontime=?, pubkeyretrynumber=?, status='msgqueued' WHERE toripe=?''')
-                            shared.sqlSubmitQueue.put(t)
-                            shared.sqlReturnQueue.get()
-                            shared.sqlSubmitQueue.put('commit')
-                            shared.workerQueue.put(('sendmessage', ''))
-                    else:  # status == msgsent
-                        if int(time.time()) - lastactiontime > (maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (msgretrynumber))):
-                            print 'It has been a long time and we haven\'t heard an acknowledgement to our msg. Sending again.'
-                            t = (int(
-                                time.time()), msgretrynumber + 1, 'msgqueued', ackdata)
-                            shared.sqlSubmitQueue.put(
-                                '''UPDATE sent SET lastactiontime=?, msgretrynumber=?, status=? WHERE ackdata=?''')
-                            shared.sqlSubmitQueue.put(t)
-                            shared.sqlReturnQueue.get()
-                            shared.sqlSubmitQueue.put('commit')
-                            shared.workerQueue.put(('sendmessage', ''))
-                            shared.UISignalQueue.put((
-                                'updateStatusBar', 'Doing work necessary to again attempt to deliver a message...'))
-                shared.sqlSubmitQueue.put('commit')
-                shared.sqlLock.release()
-            time.sleep(300)
-
-# This thread, of which there is only one, does the heavy lifting:
-# calculating POWs.
-
-
-class singleWorker(threading.Thread):
-
-    def __init__(self):
-        # QThread.__init__(self, parent)
-        threading.Thread.__init__(self)
-
-    def run(self):
-        shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put(
-            '''SELECT toripe FROM sent WHERE ((status='awaitingpubkey' OR status='doingpubkeypow') AND folder='sent')''')
-        shared.sqlSubmitQueue.put('')
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        for row in queryreturn:
-            toripe, = row
-            neededPubkeys[toripe] = 0
-
-        # Initialize the ackdataForWhichImWatching data structure using data
-        # from the sql database.
-        shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put(
-            '''SELECT ackdata FROM sent where (status='msgsent' OR status='doingmsgpow')''')
-        shared.sqlSubmitQueue.put('')
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        for row in queryreturn:
-            ackdata, = row
-            print 'Watching for ackdata', ackdata.encode('hex')
-            ackdataForWhichImWatching[ackdata] = 0
-
-        shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put(
-            '''SELECT DISTINCT toaddress FROM sent WHERE (status='doingpubkeypow' AND folder='sent')''')
-        shared.sqlSubmitQueue.put('')
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        for row in queryreturn:
-            toaddress, = row
-            self.requestPubKey(toaddress)
-
-        time.sleep(
-            10)  # give some time for the GUI to start before we start on existing POW tasks.
-
-        self.sendMsg()
-                     # just in case there are any pending tasks for msg
-                     # messages that have yet to be sent.
-        self.sendBroadcast()
-                           # just in case there are any tasks for Broadcasts
-                           # that have yet to be sent.
-
-        while True:
-            command, data = shared.workerQueue.get()
-            if command == 'sendmessage':
-                self.sendMsg()
-            elif command == 'sendbroadcast':
-                self.sendBroadcast()
-            elif command == 'doPOWForMyV2Pubkey':
-                self.doPOWForMyV2Pubkey(data)
-            elif command == 'doPOWForMyV3Pubkey':
-                self.doPOWForMyV3Pubkey(data)
-                """elif command == 'newpubkey':
-                    toAddressVersion,toStreamNumber,toRipe = data
-                    if toRipe in neededPubkeys:
-                        print 'We have been awaiting the arrival of this pubkey.'
-                        del neededPubkeys[toRipe]
-                        t = (toRipe,)
-                        shared.sqlLock.acquire()
-                        shared.sqlSubmitQueue.put('''UPDATE sent SET status='doingmsgpow' WHERE toripe=? AND status='awaitingpubkey' and folder='sent' ''')
-                        shared.sqlSubmitQueue.put(t)
-                        shared.sqlReturnQueue.get()
-                        shared.sqlSubmitQueue.put('commit')
-                        shared.sqlLock.release()
-                        self.sendMsg()
-                    else:
-                        shared.printLock.acquire()
-                        print 'We don\'t need this pub key. We didn\'t ask for it. Pubkey hash:', toRipe.encode('hex')
-                        shared.printLock.release()"""
-            else:
-                shared.printLock.acquire()
-                sys.stderr.write(
-                    'Probable programming error: The command sent to the workerThread is weird. It is: %s\n' % command)
-                shared.printLock.release()
-            shared.workerQueue.task_done()
-
-    def doPOWForMyV2Pubkey(self, hash):  # This function also broadcasts out the pubkey message once it is done with the POW
-        # Look up my stream number based on my address hash
-        """configSections = shared.config.sections()
-        for addressInKeysFile in configSections:
-            if addressInKeysFile <> 'bitmessagesettings':
-                status,addressVersionNumber,streamNumber,hashFromThisParticularAddress = decodeAddress(addressInKeysFile)
-                if hash == hashFromThisParticularAddress:
-                    myAddress = addressInKeysFile
-                    break"""
-        myAddress = shared.myAddressesByHash[hash]
-        status, addressVersionNumber, streamNumber, hash = decodeAddress(
-            myAddress)
-        embeddedTime = int(time.time() + random.randrange(
-            -300, 300))  # the current time plus or minus five minutes
-        payload = pack('>I', (embeddedTime))
-        payload += encodeVarint(addressVersionNumber)  # Address version number
-        payload += encodeVarint(streamNumber)
-        payload += '\x00\x00\x00\x01'  # bitfield of features supported by me (see the wiki).
-
-        try:
-            privSigningKeyBase58 = shared.config.get(
-                myAddress, 'privsigningkey')
-            privEncryptionKeyBase58 = shared.config.get(
-                myAddress, 'privencryptionkey')
-        except Exception as err:
-            shared.printLock.acquire()
-            sys.stderr.write(
-                'Error within doPOWForMyV2Pubkey. Could not read the keys from the keys.dat file for a requested address. %s\n' % err)
-            shared.printLock.release()
-            return
-
-        privSigningKeyHex = shared.decodeWalletImportFormat(
-            privSigningKeyBase58).encode('hex')
-        privEncryptionKeyHex = shared.decodeWalletImportFormat(
-            privEncryptionKeyBase58).encode('hex')
-        pubSigningKey = highlevelcrypto.privToPub(
-            privSigningKeyHex).decode('hex')
-        pubEncryptionKey = highlevelcrypto.privToPub(
-            privEncryptionKeyHex).decode('hex')
-
-        payload += pubSigningKey[1:]
-        payload += pubEncryptionKey[1:]
-
-        # Do the POW for this pubkey message
-        target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes +
-                             8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
-        print '(For pubkey message) Doing proof of work...'
-        initialHash = hashlib.sha512(payload).digest()
-        trialValue, nonce = proofofwork.run(target, initialHash)
-        print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce
-        payload = pack('>Q', nonce) + payload
-        """t = (hash,payload,embeddedTime,'no')
-        shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''')
-        shared.sqlSubmitQueue.put(t)
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlSubmitQueue.put('commit')
-        shared.sqlLock.release()"""
-
-        inventoryHash = calculateInventoryHash(payload)
-        objectType = 'pubkey'
-        shared.inventory[inventoryHash] = (
-            objectType, streamNumber, payload, embeddedTime)
-
-        shared.printLock.acquire()
-        print 'broadcasting inv with hash:', inventoryHash.encode('hex')
-        shared.printLock.release()
-        shared.broadcastToSendDataQueues((
-            streamNumber, 'sendinv', inventoryHash))
-        shared.UISignalQueue.put(('updateStatusBar', ''))
-        shared.config.set(
-            myAddress, 'lastpubkeysendtime', str(int(time.time())))
-        with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-            shared.config.write(configfile)
-
-    def doPOWForMyV3Pubkey(self, hash):  # This function also broadcasts out the pubkey message once it is done with the POW
-        myAddress = shared.myAddressesByHash[hash]
-        status, addressVersionNumber, streamNumber, hash = decodeAddress(
-            myAddress)
-        embeddedTime = int(time.time() + random.randrange(
-            -300, 300))  # the current time plus or minus five minutes
-        payload = pack('>I', (embeddedTime))
-        payload += encodeVarint(addressVersionNumber)  # Address version number
-        payload += encodeVarint(streamNumber)
-        payload += '\x00\x00\x00\x01'  # bitfield of features supported by me (see the wiki).
-
-        try:
-            privSigningKeyBase58 = shared.config.get(
-                myAddress, 'privsigningkey')
-            privEncryptionKeyBase58 = shared.config.get(
-                myAddress, 'privencryptionkey')
-        except Exception as err:
-            shared.printLock.acquire()
-            sys.stderr.write(
-                'Error within doPOWForMyV3Pubkey. Could not read the keys from the keys.dat file for a requested address. %s\n' % err)
-            shared.printLock.release()
-            return
-
-        privSigningKeyHex = shared.decodeWalletImportFormat(
-            privSigningKeyBase58).encode('hex')
-        privEncryptionKeyHex = shared.decodeWalletImportFormat(
-            privEncryptionKeyBase58).encode('hex')
-        pubSigningKey = highlevelcrypto.privToPub(
-            privSigningKeyHex).decode('hex')
-        pubEncryptionKey = highlevelcrypto.privToPub(
-            privEncryptionKeyHex).decode('hex')
-
-        payload += pubSigningKey[1:]
-        payload += pubEncryptionKey[1:]
-
-        payload += encodeVarint(shared.config.getint(
-            myAddress, 'noncetrialsperbyte'))
-        payload += encodeVarint(shared.config.getint(
-            myAddress, 'payloadlengthextrabytes'))
-        signature = highlevelcrypto.sign(payload, privSigningKeyHex)
-        payload += encodeVarint(len(signature))
-        payload += signature
-
-        # Do the POW for this pubkey message
-        target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes +
-                             8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
-        print '(For pubkey message) Doing proof of work...'
-        initialHash = hashlib.sha512(payload).digest()
-        trialValue, nonce = proofofwork.run(target, initialHash)
-        print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce
-
-        payload = pack('>Q', nonce) + payload
-        """t = (hash,payload,embeddedTime,'no')
-        shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''')
-        shared.sqlSubmitQueue.put(t)
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlSubmitQueue.put('commit')
-        shared.sqlLock.release()"""
-
-        inventoryHash = calculateInventoryHash(payload)
-        objectType = 'pubkey'
-        shared.inventory[inventoryHash] = (
-            objectType, streamNumber, payload, embeddedTime)
-
-        shared.printLock.acquire()
-        print 'broadcasting inv with hash:', inventoryHash.encode('hex')
-        shared.printLock.release()
-        shared.broadcastToSendDataQueues((
-            streamNumber, 'sendinv', inventoryHash))
-        shared.UISignalQueue.put(('updateStatusBar', ''))
-        shared.config.set(
-            myAddress, 'lastpubkeysendtime', str(int(time.time())))
-        with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-            shared.config.write(configfile)
-
-    def sendBroadcast(self):
-        shared.sqlLock.acquire()
-        t = ('broadcastqueued',)
-        shared.sqlSubmitQueue.put(
-            '''SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=? and folder='sent' ''')
-        shared.sqlSubmitQueue.put(t)
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        for row in queryreturn:
-            fromaddress, subject, body, ackdata = row
-            status, addressVersionNumber, streamNumber, ripe = decodeAddress(
-                fromaddress)
-            if addressVersionNumber == 2 and int(time.time()) < encryptedBroadcastSwitchoverTime:
-                # We need to convert our private keys to public keys in order
-                # to include them.
-                try:
-                    privSigningKeyBase58 = shared.config.get(
-                        fromaddress, 'privsigningkey')
-                    privEncryptionKeyBase58 = shared.config.get(
-                        fromaddress, 'privencryptionkey')
-                except:
-                    shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
-                        ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file."))))
-                    continue
-
-                privSigningKeyHex = shared.decodeWalletImportFormat(
-                    privSigningKeyBase58).encode('hex')
-                privEncryptionKeyHex = shared.decodeWalletImportFormat(
-                    privEncryptionKeyBase58).encode('hex')
-
-                pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode(
-                    'hex')  # At this time these pubkeys are 65 bytes long because they include the encoding byte which we won't be sending in the broadcast message.
-                pubEncryptionKey = highlevelcrypto.privToPub(
-                    privEncryptionKeyHex).decode('hex')
-
-                payload = pack('>Q', (int(time.time()) + random.randrange(
-                    -300, 300)))  # the current time plus or minus five minutes
-                payload += encodeVarint(1)  # broadcast version
-                payload += encodeVarint(addressVersionNumber)
-                payload += encodeVarint(streamNumber)
-                payload += '\x00\x00\x00\x01'  # behavior bitfield
-                payload += pubSigningKey[1:]
-                payload += pubEncryptionKey[1:]
-                payload += ripe
-                payload += '\x02'  # message encoding type
-                payload += encodeVarint(len(
-                    'Subject:' + subject + '\n' + 'Body:' + body))  # Type 2 is simple UTF-8 message encoding.
-                payload += 'Subject:' + subject + '\n' + 'Body:' + body
-
-                signature = highlevelcrypto.sign(payload, privSigningKeyHex)
-                payload += encodeVarint(len(signature))
-                payload += signature
-
-                target = 2 ** 64 / ((len(
-                    payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
-                print '(For broadcast message) Doing proof of work...'
-                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
-                    ackdata, _translate("MainWindow", "Doing work necessary to send broadcast..."))))
-                initialHash = hashlib.sha512(payload).digest()
-                trialValue, nonce = proofofwork.run(target, initialHash)
-                print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce
-
-                payload = pack('>Q', nonce) + payload
-
-                inventoryHash = calculateInventoryHash(payload)
-                objectType = 'broadcast'
-                shared.inventory[inventoryHash] = (
-                    objectType, streamNumber, payload, int(time.time()))
-                print 'Broadcasting inv for my broadcast (within sendBroadcast function):', inventoryHash.encode('hex')
-                shared.broadcastToSendDataQueues((
-                    streamNumber, 'sendinv', inventoryHash))
-
-                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Broadcast sent on %1").arg(unicode(
-                    strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
-
-                # Update the status of the message in the 'sent' table to have
-                # a 'broadcastsent' status
-                shared.sqlLock.acquire()
-                t = ('broadcastsent', int(
-                    time.time()), fromaddress, subject, body, 'broadcastqueued')
-                shared.sqlSubmitQueue.put(
-                    'UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?')
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlSubmitQueue.put('commit')
-                shared.sqlLock.release()
-            elif addressVersionNumber == 3 or int(time.time()) > encryptedBroadcastSwitchoverTime:
-                # We need to convert our private keys to public keys in order
-                # to include them.
-                try:
-                    privSigningKeyBase58 = shared.config.get(
-                        fromaddress, 'privsigningkey')
-                    privEncryptionKeyBase58 = shared.config.get(
-                        fromaddress, 'privencryptionkey')
-                except:
-                    shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
-                        ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file."))))
-                    continue
-
-                privSigningKeyHex = shared.decodeWalletImportFormat(
-                    privSigningKeyBase58).encode('hex')
-                privEncryptionKeyHex = shared.decodeWalletImportFormat(
-                    privEncryptionKeyBase58).encode('hex')
-
-                pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode(
-                    'hex')  # At this time these pubkeys are 65 bytes long because they include the encoding byte which we won't be sending in the broadcast message.
-                pubEncryptionKey = highlevelcrypto.privToPub(
-                    privEncryptionKeyHex).decode('hex')
-
-                payload = pack('>Q', (int(time.time()) + random.randrange(
-                    -300, 300)))  # the current time plus or minus five minutes
-                payload += encodeVarint(2)  # broadcast version
-                payload += encodeVarint(streamNumber)
-
-                dataToEncrypt = encodeVarint(2)  # broadcast version
-                dataToEncrypt += encodeVarint(addressVersionNumber)
-                dataToEncrypt += encodeVarint(streamNumber)
-                dataToEncrypt += '\x00\x00\x00\x01'  # behavior bitfield
-                dataToEncrypt += pubSigningKey[1:]
-                dataToEncrypt += pubEncryptionKey[1:]
-		if addressVersionNumber >= 3:
-                    dataToEncrypt += encodeVarint(shared.config.getint(fromaddress,'noncetrialsperbyte'))
-                    dataToEncrypt += encodeVarint(shared.config.getint(fromaddress,'payloadlengthextrabytes'))
-                dataToEncrypt += '\x02' # message encoding type
-                dataToEncrypt += encodeVarint(len('Subject:' + subject + '\n' + 'Body:' + body))  #Type 2 is simple UTF-8 message encoding per the documentation on the wiki.
-                dataToEncrypt += 'Subject:' + subject + '\n' + 'Body:' + body
-                signature = highlevelcrypto.sign(
-                    dataToEncrypt, privSigningKeyHex)
-                dataToEncrypt += encodeVarint(len(signature))
-                dataToEncrypt += signature
-
-                # Encrypt the broadcast with the information contained in the broadcaster's address. Anyone who knows the address can generate 
-                # the private encryption key to decrypt the broadcast. This provides virtually no privacy; its purpose is to keep questionable 
-                # and illegal content from flowing through the Internet connections and being stored on the disk of 3rd parties. 
-                privEncryptionKey = hashlib.sha512(encodeVarint(
-                    addressVersionNumber) + encodeVarint(streamNumber) + ripe).digest()[:32]
-                pubEncryptionKey = pointMult(privEncryptionKey)
-                payload += highlevelcrypto.encrypt(
-                    dataToEncrypt, pubEncryptionKey.encode('hex'))
-
-                target = 2 ** 64 / ((len(
-                    payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
-                print '(For broadcast message) Doing proof of work...'
-                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
-                    ackdata, _translate("MainWindow", "Doing work necessary to send broadcast..."))))
-                initialHash = hashlib.sha512(payload).digest()
-                trialValue, nonce = proofofwork.run(target, initialHash)
-                print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce
-
-                payload = pack('>Q', nonce) + payload
-
-                inventoryHash = calculateInventoryHash(payload)
-                objectType = 'broadcast'
-                shared.inventory[inventoryHash] = (
-                    objectType, streamNumber, payload, int(time.time()))
-                print 'sending inv (within sendBroadcast function)'
-                shared.broadcastToSendDataQueues((
-                    streamNumber, 'sendinv', inventoryHash))
-
-                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Broadcast sent on %1").arg(unicode(
-                    strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
-
-                # Update the status of the message in the 'sent' table to have
-                # a 'broadcastsent' status
-                shared.sqlLock.acquire()
-                t = ('broadcastsent', int(
-                    time.time()), fromaddress, subject, body, 'broadcastqueued')
-                shared.sqlSubmitQueue.put(
-                    'UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?')
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlSubmitQueue.put('commit')
-                shared.sqlLock.release()
-            else:
-                shared.printLock.acquire()
-                sys.stderr.write(
-                    'Error: In the singleWorker thread, the sendBroadcast function doesn\'t understand the address version.\n')
-                shared.printLock.release()
-
-    def sendMsg(self):
-        # Check to see if there are any messages queued to be sent
-        shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put(
-            '''SELECT DISTINCT toaddress FROM sent WHERE (status='msgqueued' AND folder='sent')''')
-        shared.sqlSubmitQueue.put('')
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        for row in queryreturn:  # For each address to which we need to send a message, check to see if we have its pubkey already.
-            toaddress, = row
-            toripe = decodeAddress(toaddress)[3]
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''SELECT hash FROM pubkeys WHERE hash=? ''')
-            shared.sqlSubmitQueue.put((toripe,))
-            queryreturn = shared.sqlReturnQueue.get()
-            shared.sqlLock.release()
-            if queryreturn != []:  # If we have the needed pubkey, set the status to doingmsgpow (we'll do it further down)
-                t = (toaddress,)
-                shared.sqlLock.acquire()
-                shared.sqlSubmitQueue.put(
-                    '''UPDATE sent SET status='doingmsgpow' WHERE toaddress=? AND status='msgqueued' ''')
-                shared.sqlSubmitQueue.put(t)
-                shared.sqlReturnQueue.get()
-                shared.sqlSubmitQueue.put('commit')
-                shared.sqlLock.release()
-            else:  # We don't have the needed pubkey. Set the status to 'awaitingpubkey' and request it if we haven't already
-                if toripe in neededPubkeys:
-                    # We already sent a request for the pubkey
-                    t = (toaddress,)
-                    shared.sqlLock.acquire()
-                    shared.sqlSubmitQueue.put(
-                        '''UPDATE sent SET status='awaitingpubkey' WHERE toaddress=? AND status='msgqueued' ''')
-                    shared.sqlSubmitQueue.put(t)
-                    shared.sqlReturnQueue.get()
-                    shared.sqlSubmitQueue.put('commit')
-                    shared.sqlLock.release()
-                    shared.UISignalQueue.put(('updateSentItemStatusByHash', (
-                        toripe, _translate("MainWindow",'Encryption key was requested earlier.'))))
-                else:
-                    # We have not yet sent a request for the pubkey
-                    t = (toaddress,)
-                    shared.sqlLock.acquire()
-                    shared.sqlSubmitQueue.put(
-                        '''UPDATE sent SET status='doingpubkeypow' WHERE toaddress=? AND status='msgqueued' ''')
-                    shared.sqlSubmitQueue.put(t)
-                    shared.sqlReturnQueue.get()
-                    shared.sqlSubmitQueue.put('commit')
-                    shared.sqlLock.release()
-                    shared.UISignalQueue.put(('updateSentItemStatusByHash', (
-                        toripe, _translate("MainWindow",'Sending a request for the recipient\'s encryption key.'))))
-                    self.requestPubKey(toaddress)
-        shared.sqlLock.acquire()
-        # Get all messages that are ready to be sent, and also all messages
-        # which we have sent in the last 28 days which were previously marked
-        # as 'toodifficult'. If the user as raised the maximum acceptable
-        # difficulty then those messages may now be sendable.
-        shared.sqlSubmitQueue.put(
-            '''SELECT toaddress, toripe, fromaddress, subject, message, ackdata, status FROM sent WHERE (status='doingmsgpow' or status='forcepow' or (status='toodifficult' and lastactiontime>?)) and folder='sent' ''')
-        shared.sqlSubmitQueue.put((int(time.time()) - 2419200,))
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        for row in queryreturn:  # For each message we need to send..
-            toaddress, toripe, fromaddress, subject, message, ackdata, status = row
-            # There is a remote possibility that we may no longer have the
-            # recipient's pubkey. Let us make sure we still have it or else the
-            # sendMsg function will appear to freeze. This can happen if the
-            # user sends a message but doesn't let the POW function finish,
-            # then leaves their client off for a long time which could cause
-            # the needed pubkey to expire and be deleted.
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''SELECT hash FROM pubkeys WHERE hash=? ''')
-            shared.sqlSubmitQueue.put((toripe,))
-            queryreturn = shared.sqlReturnQueue.get()
-            shared.sqlLock.release()
-            if queryreturn == [] and toripe not in neededPubkeys:
-                # We no longer have the needed pubkey and we haven't requested
-                # it.
-                shared.printLock.acquire()
-                sys.stderr.write(
-                    'For some reason, the status of a message in our outbox is \'doingmsgpow\' even though we lack the pubkey. Here is the RIPE hash of the needed pubkey: %s\n' % toripe.encode('hex'))
-                shared.printLock.release()
-                t = (toaddress,)
-                shared.sqlLock.acquire()
-                shared.sqlSubmitQueue.put(
-                    '''UPDATE sent SET status='msgqueued' WHERE toaddress=? AND status='doingmsgpow' ''')
-                shared.sqlSubmitQueue.put(t)
-                shared.sqlReturnQueue.get()
-                shared.sqlSubmitQueue.put('commit')
-                shared.sqlLock.release()
-                shared.UISignalQueue.put(('updateSentItemStatusByHash', (
-                    toripe, _translate("MainWindow",'Sending a request for the recipient\'s encryption key.'))))
-                self.requestPubKey(toaddress)
-                continue
-            ackdataForWhichImWatching[ackdata] = 0
-            toStatus, toAddressVersionNumber, toStreamNumber, toHash = decodeAddress(
-                toaddress)
-            fromStatus, fromAddressVersionNumber, fromStreamNumber, fromHash = decodeAddress(
-                fromaddress)
-            shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
-                ackdata, _translate("MainWindow", "Looking up the receiver\'s public key"))))
-            shared.printLock.acquire()
-            print 'Found a message in our database that needs to be sent with this pubkey.'
-            print 'First 150 characters of message:', repr(message[:150])
-            shared.printLock.release()
-
-            # mark the pubkey as 'usedpersonally' so that we don't ever delete
-            # it.
-            shared.sqlLock.acquire()
-            t = (toripe,)
-            shared.sqlSubmitQueue.put(
-                '''UPDATE pubkeys SET usedpersonally='yes' WHERE hash=?''')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            # Let us fetch the recipient's public key out of our database. If
-            # the required proof of work difficulty is too hard then we'll
-            # abort.
-            shared.sqlSubmitQueue.put(
-                'SELECT transmitdata FROM pubkeys WHERE hash=?')
-            shared.sqlSubmitQueue.put((toripe,))
-            queryreturn = shared.sqlReturnQueue.get()
-            shared.sqlLock.release()
-            if queryreturn == []:
-                shared.printLock.acquire()
-                sys.stderr.write(
-                    '(within sendMsg) The needed pubkey was not found. This should never happen. Aborting send.\n')
-                shared.printLock.release()
-                return
-            for row in queryreturn:
-                pubkeyPayload, = row
-
-            # The pubkey message is stored the way we originally received it
-            # which means that we need to read beyond things like the nonce and
-            # time to get to the actual public keys.
-            readPosition = 8  # to bypass the nonce
-            pubkeyEmbeddedTime, = unpack(
-                '>I', pubkeyPayload[readPosition:readPosition + 4])
-            # This section is used for the transition from 32 bit time to 64
-            # bit time in the protocol.
-            if pubkeyEmbeddedTime == 0:
-                pubkeyEmbeddedTime, = unpack(
-                    '>Q', pubkeyPayload[readPosition:readPosition + 8])
-                readPosition += 8
-            else:
-                readPosition += 4
-            readPosition += 1  # to bypass the address version whose length is definitely 1
-            streamNumber, streamNumberLength = decodeVarint(
-                pubkeyPayload[readPosition:readPosition + 10])
-            readPosition += streamNumberLength
-            behaviorBitfield = pubkeyPayload[readPosition:readPosition + 4]
-            readPosition += 4  # to bypass the bitfield of behaviors
-            # pubSigningKeyBase256 =
-            # pubkeyPayload[readPosition:readPosition+64] #We don't use this
-            # key for anything here.
-            readPosition += 64
-            pubEncryptionKeyBase256 = pubkeyPayload[
-                readPosition:readPosition + 64]
-            readPosition += 64
-            if toAddressVersionNumber == 2:
-                requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
-                requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
-                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
-                    ackdata, _translate("MainWindow", "Doing work necessary to send message.\nThere is no required difficulty for version 2 addresses like this."))))
-            elif toAddressVersionNumber == 3:
-                requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(
-                    pubkeyPayload[readPosition:readPosition + 10])
-                readPosition += varintLength
-                requiredPayloadLengthExtraBytes, varintLength = decodeVarint(
-                    pubkeyPayload[readPosition:readPosition + 10])
-                readPosition += varintLength
-                if requiredAverageProofOfWorkNonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte:  # We still have to meet a minimum POW difficulty regardless of what they say is allowed in order to get our message to propagate through the network.
-                    requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
-                if requiredPayloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes:
-                    requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
-                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Doing work necessary to send message.\nReceiver\'s required difficulty: %1 and %2").arg(str(float(
-                    requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte)).arg(str(float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)))))
-                if status != 'forcepow':
-                    if (requiredAverageProofOfWorkNonceTrialsPerByte > shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') and shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') != 0) or (requiredPayloadLengthExtraBytes > shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') and shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') != 0):
-                        # The demanded difficulty is more than we are willing
-                        # to do.
-                        shared.sqlLock.acquire()
-                        t = (ackdata,)
-                        shared.sqlSubmitQueue.put(
-                            '''UPDATE sent SET status='toodifficult' WHERE ackdata=? ''')
-                        shared.sqlSubmitQueue.put(t)
-                        shared.sqlReturnQueue.get()
-                        shared.sqlSubmitQueue.put('commit')
-                        shared.sqlLock.release()
-                        shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do.").arg(str(float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte)).arg(str(float(
-                            requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)).arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
-                        continue
-
-            embeddedTime = pack('>Q', (int(time.time()) + random.randrange(
-                -300, 300)))  # the current time plus or minus five minutes. We will use this time both for our message and for the ackdata packed within our message.
-            if fromAddressVersionNumber == 2:
-                payload = '\x01'  # Message version.
-                payload += encodeVarint(fromAddressVersionNumber)
-                payload += encodeVarint(fromStreamNumber)
-                payload += '\x00\x00\x00\x01'  # Bitfield of features and behaviors that can be expected from me. (See https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features  )
-
-                # We need to convert our private keys to public keys in order
-                # to include them.
-                try:
-                    privSigningKeyBase58 = shared.config.get(
-                        fromaddress, 'privsigningkey')
-                    privEncryptionKeyBase58 = shared.config.get(
-                        fromaddress, 'privencryptionkey')
-                except:
-                    shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
-                        ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file."))))
-                    continue
-
-                privSigningKeyHex = shared.decodeWalletImportFormat(
-                    privSigningKeyBase58).encode('hex')
-                privEncryptionKeyHex = shared.decodeWalletImportFormat(
-                    privEncryptionKeyBase58).encode('hex')
-
-                pubSigningKey = highlevelcrypto.privToPub(
-                    privSigningKeyHex).decode('hex')
-                pubEncryptionKey = highlevelcrypto.privToPub(
-                    privEncryptionKeyHex).decode('hex')
-
-                payload += pubSigningKey[
-                    1:]  # The \x04 on the beginning of the public keys are not sent. This way there is only one acceptable way to encode and send a public key.
-                payload += pubEncryptionKey[1:]
-
-                payload += toHash  # This hash will be checked by the receiver of the message to verify that toHash belongs to them. This prevents a Surreptitious Forwarding Attack.
-                payload += '\x02'  # Type 2 is simple UTF-8 message encoding as specified on the Protocol Specification on the Bitmessage Wiki.
-                messageToTransmit = 'Subject:' + \
-                    subject + '\n' + 'Body:' + message
-                payload += encodeVarint(len(messageToTransmit))
-                payload += messageToTransmit
-                fullAckPayload = self.generateFullAckMessage(
-                    ackdata, toStreamNumber, embeddedTime)  # The fullAckPayload is a normal msg protocol message with the proof of work already completed that the receiver of this message can easily send out.
-                payload += encodeVarint(len(fullAckPayload))
-                payload += fullAckPayload
-                signature = highlevelcrypto.sign(payload, privSigningKeyHex)
-                payload += encodeVarint(len(signature))
-                payload += signature
-
-            if fromAddressVersionNumber == 3:
-                payload = '\x01'  # Message version.
-                payload += encodeVarint(fromAddressVersionNumber)
-                payload += encodeVarint(fromStreamNumber)
-                payload += '\x00\x00\x00\x01'  # Bitfield of features and behaviors that can be expected from me. (See https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features  )
-
-                # We need to convert our private keys to public keys in order
-                # to include them.
-                try:
-                    privSigningKeyBase58 = shared.config.get(
-                        fromaddress, 'privsigningkey')
-                    privEncryptionKeyBase58 = shared.config.get(
-                        fromaddress, 'privencryptionkey')
-                except:
-                    shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
-                        ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file."))))
-                    continue
-
-                privSigningKeyHex = shared.decodeWalletImportFormat(
-                    privSigningKeyBase58).encode('hex')
-                privEncryptionKeyHex = shared.decodeWalletImportFormat(
-                    privEncryptionKeyBase58).encode('hex')
-
-                pubSigningKey = highlevelcrypto.privToPub(
-                    privSigningKeyHex).decode('hex')
-                pubEncryptionKey = highlevelcrypto.privToPub(
-                    privEncryptionKeyHex).decode('hex')
-
-                payload += pubSigningKey[
-                    1:]  # The \x04 on the beginning of the public keys are not sent. This way there is only one acceptable way to encode and send a public key.
-                payload += pubEncryptionKey[1:]
-                # If the receiver of our message is in our address book,
-                # subscriptions list, or whitelist then we will allow them to
-                # do the network-minimum proof of work. Let us check to see if
-                # the receiver is in any of those lists.
-                if shared.isAddressInMyAddressBookSubscriptionsListOrWhitelist(toaddress):
-                    payload += encodeVarint(
-                        shared.networkDefaultProofOfWorkNonceTrialsPerByte)
-                    payload += encodeVarint(
-                        shared.networkDefaultPayloadLengthExtraBytes)
-                else:
-                    payload += encodeVarint(shared.config.getint(
-                        fromaddress, 'noncetrialsperbyte'))
-                    payload += encodeVarint(shared.config.getint(
-                        fromaddress, 'payloadlengthextrabytes'))
-
-                payload += toHash  # This hash will be checked by the receiver of the message to verify that toHash belongs to them. This prevents a Surreptitious Forwarding Attack.
-                payload += '\x02'  # Type 2 is simple UTF-8 message encoding as specified on the Protocol Specification on the Bitmessage Wiki.
-                messageToTransmit = 'Subject:' + \
-                    subject + '\n' + 'Body:' + message
-                payload += encodeVarint(len(messageToTransmit))
-                payload += messageToTransmit
-                fullAckPayload = self.generateFullAckMessage(
-                    ackdata, toStreamNumber, embeddedTime)  # The fullAckPayload is a normal msg protocol message with the proof of work already completed that the receiver of this message can easily send out.
-                payload += encodeVarint(len(fullAckPayload))
-                payload += fullAckPayload
-                signature = highlevelcrypto.sign(payload, privSigningKeyHex)
-                payload += encodeVarint(len(signature))
-                payload += signature
-
-
-            # We have assembled the data that will be encrypted.
-            try:
-                encrypted = highlevelcrypto.encrypt(payload,"04"+pubEncryptionKeyBase256.encode('hex'))
-            except:
-                shared.sqlLock.acquire()
-                t = (ackdata,)
-                shared.sqlSubmitQueue.put('''UPDATE sent SET status='badkey' WHERE ackdata=?''')
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlSubmitQueue.put('commit')
-                shared.sqlLock.release()
-                shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,_translate("MainWindow",'Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1').arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))))
-                continue
-            encryptedPayload = embeddedTime + encodeVarint(toStreamNumber) + encrypted
-            target = 2**64 / ((len(encryptedPayload)+requiredPayloadLengthExtraBytes+8) * requiredAverageProofOfWorkNonceTrialsPerByte)
-            shared.printLock.acquire()
-            print '(For msg message) Doing proof of work. Total required difficulty:', float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte, 'Required small message difficulty:', float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes
-            shared.printLock.release()
-            powStartTime = time.time()
-            initialHash = hashlib.sha512(encryptedPayload).digest()
-            trialValue, nonce = proofofwork.run(target, initialHash)
-            shared.printLock.acquire()
-            print '(For msg message) Found proof of work', trialValue, 'Nonce:', nonce
-            try:
-                print 'POW took', int(time.time() - powStartTime), 'seconds.', nonce / (time.time() - powStartTime), 'nonce trials per second.'
-            except:
-                pass
-            shared.printLock.release()
-            encryptedPayload = pack('>Q', nonce) + encryptedPayload
-
-            inventoryHash = calculateInventoryHash(encryptedPayload)
-            objectType = 'msg'
-            shared.inventory[inventoryHash] = (
-                objectType, toStreamNumber, encryptedPayload, int(time.time()))
-            shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent on %1").arg(unicode(
-                strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
-            print 'Broadcasting inv for my msg(within sendmsg function):', inventoryHash.encode('hex')
-            shared.broadcastToSendDataQueues((
-                streamNumber, 'sendinv', inventoryHash))
-
-            # Update the status of the message in the 'sent' table to have a
-            # 'msgsent' status
-            shared.sqlLock.acquire()
-            t = (ackdata,)
-            shared.sqlSubmitQueue.put('''UPDATE sent SET status='msgsent' WHERE ackdata=?''')
-            shared.sqlSubmitQueue.put(t)
-            queryreturn = shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
-
-    def requestPubKey(self, toAddress):
-        toStatus, addressVersionNumber, streamNumber, ripe = decodeAddress(
-            toAddress)
-        if toStatus != 'success':
-            shared.printLock.acquire()
-            sys.stderr.write('Very abnormal error occurred in requestPubKey. toAddress is: ' + repr(
-                toAddress) + '. Please report this error to Atheros.')
-            shared.printLock.release()
-            return
-        neededPubkeys[ripe] = 0
-        payload = pack('>Q', (int(time.time()) + random.randrange(
-            -300, 300)))  # the current time plus or minus five minutes.
-        payload += encodeVarint(addressVersionNumber)
-        payload += encodeVarint(streamNumber)
-        payload += ripe
-        shared.printLock.acquire()
-        print 'making request for pubkey with ripe:', ripe.encode('hex')
-        shared.printLock.release()
-        # print 'trial value', trialValue
-        statusbar = 'Doing the computations necessary to request the recipient\'s public key.'
-        shared.UISignalQueue.put(('updateStatusBar', statusbar))
-        shared.UISignalQueue.put(('updateSentItemStatusByHash', (
-            ripe, _translate("MainWindow",'Doing work necessary to request encryption key.'))))
-        target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes +
-                             8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
-        initialHash = hashlib.sha512(payload).digest()
-        trialValue, nonce = proofofwork.run(target, initialHash)
-        shared.printLock.acquire()
-        print 'Found proof of work', trialValue, 'Nonce:', nonce
-        shared.printLock.release()
-
-        payload = pack('>Q', nonce) + payload
-        inventoryHash = calculateInventoryHash(payload)
-        objectType = 'getpubkey'
-        shared.inventory[inventoryHash] = (
-            objectType, streamNumber, payload, int(time.time()))
-        print 'sending inv (for the getpubkey message)'
-        shared.broadcastToSendDataQueues((
-            streamNumber, 'sendinv', inventoryHash))
-
-        t = (toAddress,)
-        shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put(
-            '''UPDATE sent SET status='awaitingpubkey' WHERE toaddress=? AND status='doingpubkeypow' ''')
-        shared.sqlSubmitQueue.put(t)
-        shared.sqlReturnQueue.get()
-        shared.sqlSubmitQueue.put('commit')
-        shared.sqlLock.release()
-
-        shared.UISignalQueue.put((
-            'updateStatusBar', _translate("MainWindow",'Broacasting the public key request. This program will auto-retry if they are offline.')))
-        shared.UISignalQueue.put(('updateSentItemStatusByHash', (ripe, _translate("MainWindow",'Sending public key request. Waiting for reply. Requested at %1').arg(unicode(
-            strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
-
-    def generateFullAckMessage(self, ackdata, toStreamNumber, embeddedTime):
-        payload = embeddedTime + encodeVarint(toStreamNumber) + ackdata
-        target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes +
-                             8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
-        shared.printLock.acquire()
-        print '(For ack message) Doing proof of work...'
-        shared.printLock.release()
-        powStartTime = time.time()
-        initialHash = hashlib.sha512(payload).digest()
-        trialValue, nonce = proofofwork.run(target, initialHash)
-        shared.printLock.acquire()
-        print '(For ack message) Found proof of work', trialValue, 'Nonce:', nonce
-        try:
-            print 'POW took', int(time.time() - powStartTime), 'seconds.', nonce / (time.time() - powStartTime), 'nonce trials per second.'
-        except:
-            pass
-        shared.printLock.release()
-        payload = pack('>Q', nonce) + payload
-        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
-        headerData += 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-        headerData += pack('>L', len(payload))
-        headerData += hashlib.sha512(payload).digest()[:4]
-        return headerData + payload
-
-
-class addressGenerator(threading.Thread):
-
-    def __init__(self):
-        # QThread.__init__(self, parent)
-        threading.Thread.__init__(self)
-
-    def run(self):
-        while True:
-            queueValue = shared.addressGeneratorQueue.get()
-            nonceTrialsPerByte = 0
-            payloadLengthExtraBytes = 0
-            if len(queueValue) == 7:
-                command, addressVersionNumber, streamNumber, label, numberOfAddressesToMake, deterministicPassphrase, eighteenByteRipe = queueValue
-            elif len(queueValue) == 9:
-                command, addressVersionNumber, streamNumber, label, numberOfAddressesToMake, deterministicPassphrase, eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes = queueValue
-            else:
-                sys.stderr.write(
-                    'Programming error: A structure with the wrong number of values was passed into the addressGeneratorQueue. Here is the queueValue: %s\n' % queueValue)
-            if addressVersionNumber < 3 or addressVersionNumber > 3:
-                sys.stderr.write(
-                    'Program error: For some reason the address generator queue has been given a request to create at least one version %s address which it cannot do.\n' % addressVersionNumber)
-            if nonceTrialsPerByte == 0:
-                nonceTrialsPerByte = shared.config.getint(
-                    'bitmessagesettings', 'defaultnoncetrialsperbyte')
-            if nonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte:
-                nonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
-            if payloadLengthExtraBytes == 0:
-                payloadLengthExtraBytes = shared.config.getint(
-                    'bitmessagesettings', 'defaultpayloadlengthextrabytes')
-            if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes:
-                payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
-            if addressVersionNumber == 3:  # currently the only one supported.
-                if command == 'createRandomAddress':
-                    shared.UISignalQueue.put((
-                        'updateStatusBar', _translate("MainWindow", "Generating one new address")))
-                    # This next section is a little bit strange. We're going to generate keys over and over until we
-                    # find one that starts with either \x00 or \x00\x00. Then when we pack them into a Bitmessage address,
-                    # we won't store the \x00 or \x00\x00 bytes thus making the
-                    # address shorter.
-                    startTime = time.time()
-                    numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix = 0
-                    potentialPrivSigningKey = OpenSSL.rand(32)
-                    potentialPubSigningKey = pointMult(potentialPrivSigningKey)
-                    while True:
-                        numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix += 1
-                        potentialPrivEncryptionKey = OpenSSL.rand(32)
-                        potentialPubEncryptionKey = pointMult(
-                            potentialPrivEncryptionKey)
-                        # print 'potentialPubSigningKey', potentialPubSigningKey.encode('hex')
-                        # print 'potentialPubEncryptionKey',
-                        # potentialPubEncryptionKey.encode('hex')
-                        ripe = hashlib.new('ripemd160')
-                        sha = hashlib.new('sha512')
-                        sha.update(
-                            potentialPubSigningKey + potentialPubEncryptionKey)
-                        ripe.update(sha.digest())
-                        # print 'potential ripe.digest',
-                        # ripe.digest().encode('hex')
-                        if eighteenByteRipe:
-                            if ripe.digest()[:2] == '\x00\x00':
-                                break
-                        else:
-                            if ripe.digest()[:1] == '\x00':
-                                break
-                    print 'Generated address with ripe digest:', ripe.digest().encode('hex')
-                    print 'Address generator calculated', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix, 'addresses at', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix / (time.time() - startTime), 'addresses per second before finding one with the correct ripe-prefix.'
-                    address = encodeAddress(3, streamNumber, ripe.digest())
-
-                    # An excellent way for us to store our keys is in Wallet Import Format. Let us convert now.
-                    # https://en.bitcoin.it/wiki/Wallet_import_format
-                    privSigningKey = '\x80' + potentialPrivSigningKey
-                    checksum = hashlib.sha256(hashlib.sha256(
-                        privSigningKey).digest()).digest()[0:4]
-                    privSigningKeyWIF = arithmetic.changebase(
-                        privSigningKey + checksum, 256, 58)
-                    # print 'privSigningKeyWIF',privSigningKeyWIF
-
-                    privEncryptionKey = '\x80' + potentialPrivEncryptionKey
-                    checksum = hashlib.sha256(hashlib.sha256(
-                        privEncryptionKey).digest()).digest()[0:4]
-                    privEncryptionKeyWIF = arithmetic.changebase(
-                        privEncryptionKey + checksum, 256, 58)
-                    # print 'privEncryptionKeyWIF',privEncryptionKeyWIF
-
-                    shared.config.add_section(address)
-                    shared.config.set(address, 'label', label)
-                    shared.config.set(address, 'enabled', 'true')
-                    shared.config.set(address, 'decoy', 'false')
-                    shared.config.set(address, 'noncetrialsperbyte', str(
-                        nonceTrialsPerByte))
-                    shared.config.set(address, 'payloadlengthextrabytes', str(
-                        payloadLengthExtraBytes))
-                    shared.config.set(
-                        address, 'privSigningKey', privSigningKeyWIF)
-                    shared.config.set(
-                        address, 'privEncryptionKey', privEncryptionKeyWIF)
-                    with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-                        shared.config.write(configfile)
-
-                    # It may be the case that this address is being generated
-                    # as a result of a call to the API. Let us put the result
-                    # in the necessary queue.
-                    apiAddressGeneratorReturnQueue.put(address)
-
-                    shared.UISignalQueue.put((
-                        'updateStatusBar', _translate("MainWindow", "Done generating address. Doing work necessary to broadcast it...")))
-                    shared.UISignalQueue.put(('writeNewAddressToTable', (
-                        label, address, streamNumber)))
-                    shared.reloadMyAddressHashes()
-                    shared.workerQueue.put((
-                        'doPOWForMyV3Pubkey', ripe.digest()))
-
-                elif command == 'createDeterministicAddresses' or command == 'getDeterministicAddress':
-                    if len(deterministicPassphrase) == 0:
-                        sys.stderr.write(
-                            'WARNING: You are creating deterministic address(es) using a blank passphrase. Bitmessage will do it but it is rather stupid.')
-                    if command == 'createDeterministicAddresses':
-                        statusbar = 'Generating ' + str(
-                            numberOfAddressesToMake) + ' new addresses.'
-                        shared.UISignalQueue.put((
-                            'updateStatusBar', statusbar))
-                    signingKeyNonce = 0
-                    encryptionKeyNonce = 1
-                    listOfNewAddressesToSendOutThroughTheAPI = [
-                    ]  # We fill out this list no matter what although we only need it if we end up passing the info to the API.
-
-                    for i in range(numberOfAddressesToMake):
-                        # This next section is a little bit strange. We're going to generate keys over and over until we
-                        # find one that has a RIPEMD hash that starts with either \x00 or \x00\x00. Then when we pack them
-                        # into a Bitmessage address, we won't store the \x00 or
-                        # \x00\x00 bytes thus making the address shorter.
-                        startTime = time.time()
-                        numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix = 0
-                        while True:
-                            numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix += 1
-                            potentialPrivSigningKey = hashlib.sha512(
-                                deterministicPassphrase + encodeVarint(signingKeyNonce)).digest()[:32]
-                            potentialPrivEncryptionKey = hashlib.sha512(
-                                deterministicPassphrase + encodeVarint(encryptionKeyNonce)).digest()[:32]
-                            potentialPubSigningKey = pointMult(
-                                potentialPrivSigningKey)
-                            potentialPubEncryptionKey = pointMult(
-                                potentialPrivEncryptionKey)
-                            # print 'potentialPubSigningKey', potentialPubSigningKey.encode('hex')
-                            # print 'potentialPubEncryptionKey',
-                            # potentialPubEncryptionKey.encode('hex')
-                            signingKeyNonce += 2
-                            encryptionKeyNonce += 2
-                            ripe = hashlib.new('ripemd160')
-                            sha = hashlib.new('sha512')
-                            sha.update(
-                                potentialPubSigningKey + potentialPubEncryptionKey)
-                            ripe.update(sha.digest())
-                            # print 'potential ripe.digest',
-                            # ripe.digest().encode('hex')
-                            if eighteenByteRipe:
-                                if ripe.digest()[:2] == '\x00\x00':
-                                    break
-                            else:
-                                if ripe.digest()[:1] == '\x00':
-                                    break
-
-                        print 'ripe.digest', ripe.digest().encode('hex')
-                        print 'Address generator calculated', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix, 'addresses at', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix / (time.time() - startTime), 'keys per second.'
-                        address = encodeAddress(3, streamNumber, ripe.digest())
-
-                        if command == 'createDeterministicAddresses':
-                            # An excellent way for us to store our keys is in Wallet Import Format. Let us convert now.
-                            # https://en.bitcoin.it/wiki/Wallet_import_format
-                            privSigningKey = '\x80' + potentialPrivSigningKey
-                            checksum = hashlib.sha256(hashlib.sha256(
-                                privSigningKey).digest()).digest()[0:4]
-                            privSigningKeyWIF = arithmetic.changebase(
-                                privSigningKey + checksum, 256, 58)
-
-                            privEncryptionKey = '\x80' + \
-                                potentialPrivEncryptionKey
-                            checksum = hashlib.sha256(hashlib.sha256(
-                                privEncryptionKey).digest()).digest()[0:4]
-                            privEncryptionKeyWIF = arithmetic.changebase(
-                                privEncryptionKey + checksum, 256, 58)
-
-                            try:
-                                shared.config.add_section(address)
-                                print 'label:', label
-                                shared.config.set(address, 'label', label)
-                                shared.config.set(address, 'enabled', 'true')
-                                shared.config.set(address, 'decoy', 'false')
-                                shared.config.set(address, 'noncetrialsperbyte', str(
-                                    nonceTrialsPerByte))
-                                shared.config.set(address, 'payloadlengthextrabytes', str(
-                                    payloadLengthExtraBytes))
-                                shared.config.set(
-                                    address, 'privSigningKey', privSigningKeyWIF)
-                                shared.config.set(
-                                    address, 'privEncryptionKey', privEncryptionKeyWIF)
-                                with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-                                    shared.config.write(configfile)
-
-                                shared.UISignalQueue.put(('writeNewAddressToTable', (
-                                    label, address, str(streamNumber))))
-                                listOfNewAddressesToSendOutThroughTheAPI.append(
-                                    address)
-                                # if eighteenByteRipe:
-                                # shared.reloadMyAddressHashes()#This is
-                                # necessary here (rather than just at the end)
-                                # because otherwise if the human generates a
-                                # large number of new addresses and uses one
-                                # before they are done generating, the program
-                                # will receive a getpubkey message and will
-                                # ignore it.
-                                shared.myECCryptorObjects[ripe.digest()] = highlevelcrypto.makeCryptor(
-                                    potentialPrivEncryptionKey.encode('hex'))
-                                shared.myAddressesByHash[
-                                    ripe.digest()] = address
-                                shared.workerQueue.put((
-                                    'doPOWForMyV3Pubkey', ripe.digest()))
-                            except:
-                                print address, 'already exists. Not adding it again.'
-
-                    # Done generating addresses.
-                    if command == 'createDeterministicAddresses':
-                        # It may be the case that this address is being
-                        # generated as a result of a call to the API. Let us
-                        # put the result in the necessary queue.
-                        apiAddressGeneratorReturnQueue.put(
-                            listOfNewAddressesToSendOutThroughTheAPI)
-                        shared.UISignalQueue.put((
-                            'updateStatusBar', _translate("MainWindow", "Done generating address")))
-                        # shared.reloadMyAddressHashes()
-                    elif command == 'getDeterministicAddress':
-                        apiAddressGeneratorReturnQueue.put(address)
-                else:
-                    raise Exception(
-                        "Error in the addressGenerator thread. Thread was given a command it could not understand: " + command)
 
 # This is one of several classes that constitute the API
 # This class was written by Vaibhav Bhatia. Modified by Jonathan Warren (Atheros).
@@ -4254,11 +200,11 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 unicode(label, 'utf-8')
             except:
                 return 'API Error 0017: Label is not valid UTF-8 data.'
-            apiAddressGeneratorReturnQueue.queue.clear()
+            shared.apiAddressGeneratorReturnQueue.queue.clear()
             streamNumberForAddress = 1
             shared.addressGeneratorQueue.put((
                 'createRandomAddress', 3, streamNumberForAddress, label, 1, "", eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes))
-            return apiAddressGeneratorReturnQueue.get()
+            return shared.apiAddressGeneratorReturnQueue.get()
         elif method == 'createDeterministicAddresses':
             if len(params) == 0:
                 return 'API Error 0000: I need parameters!'
@@ -4331,13 +277,13 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 return 'API Error 0004: Why would you ask me to generate 0 addresses for you?'
             if numberOfAddresses > 999:
                 return 'API Error 0005: You have (accidentally?) specified too many addresses to make. Maximum 999. This check only exists to prevent mischief; if you really want to create more addresses than this, contact the Bitmessage developers and we can modify the check or you can do it yourself by searching the source code for this message.'
-            apiAddressGeneratorReturnQueue.queue.clear()
+            shared.apiAddressGeneratorReturnQueue.queue.clear()
             print 'Requesting that the addressGenerator create', numberOfAddresses, 'addresses.'
             shared.addressGeneratorQueue.put(
                 ('createDeterministicAddresses', addressVersionNumber, streamNumber,
                  'unused API address', numberOfAddresses, passphrase, eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes))
             data = '{"addresses":['
-            queueReturn = apiAddressGeneratorReturnQueue.get()
+            queueReturn = shared.apiAddressGeneratorReturnQueue.get()
             for item in queueReturn:
                 if len(data) > 20:
                     data += ','
@@ -4357,12 +303,12 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 return 'API Error 0002: The address version number currently must be 3. ' + addressVersionNumber + ' isn\'t supported.'
             if streamNumber != 1:
                 return 'API Error 0003: The stream number must be 1. Others aren\'t supported.'
-            apiAddressGeneratorReturnQueue.queue.clear()
+            shared.apiAddressGeneratorReturnQueue.queue.clear()
             print 'Requesting that the addressGenerator create', numberOfAddresses, 'addresses.'
             shared.addressGeneratorQueue.put(
                 ('getDeterministicAddress', addressVersionNumber,
                  streamNumber, 'unused API address', numberOfAddresses, passphrase, eighteenByteRipe))
-            return apiAddressGeneratorReturnQueue.get()
+            return shared.apiAddressGeneratorReturnQueue.get()
         elif method == 'getAllInboxMessages':
             shared.sqlLock.acquire()
             shared.sqlSubmitQueue.put(
@@ -4382,37 +328,134 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             data += ']}'
             return data
         elif method == 'getInboxMessageById':
-            if len(params) < 1:
+            if len(params) == 0:
-                return 'API Error 0000: I need one parameter.'
+                return 'API Error 0000: I need parameters!'
             msgid = params[0].decode('hex')
             v = (msgid,)
             shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put('''SELECT toaddress, fromaddress, subject, received, message, encodingtype FROM inbox WHERE msgid=?''')
+            shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, received, message, encodingtype FROM inbox WHERE msgid=?''')
             shared.sqlSubmitQueue.put(v)
             queryreturn = shared.sqlReturnQueue.get()
             shared.sqlLock.release()
             data = '{"inboxMessage":['
             for row in queryreturn:
-                toAddress, fromAddress, subject, received, message, encodingtype = row
+                msgid, toAddress, fromAddress, subject, received, message, encodingtype = row
                 subject = shared.fixPotentiallyInvalidUTF8Data(subject)
                 message = shared.fixPotentiallyInvalidUTF8Data(message)
                 data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':encodingtype,'receivedTime':received},indent=4, separators=(',', ': '))
             data += ']}'
             return data
-        elif method == 'trashMessage':
+        elif method == 'getAllSentMessages':
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent where folder='sent' ORDER BY lastactiontime''')
+            shared.sqlSubmitQueue.put('')
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            data = '{"sentMessages":['
+            for row in queryreturn:
+                msgid, toAddress, fromAddress, subject, lastactiontime, message, encodingtype, status, ackdata = row
+                subject = shared.fixPotentiallyInvalidUTF8Data(subject)
+                message = shared.fixPotentiallyInvalidUTF8Data(message)
+                if len(data) > 25:
+                    data += ','
+                data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':encodingtype,'lastActionTime':lastactiontime,'status':status,'ackData':ackdata.encode('hex')},indent=4, separators=(',', ': '))
+            data += ']}'
+            return data
+        elif method == 'getInboxMessagesByAddress':
+            if len(params) == 0:
+                return 'API Error 0000: I need parameters!'
+            toAddress = params[0]
+            v = (toAddress,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, received, message, encodingtype FROM inbox WHERE folder='inbox' AND toAddress=?''')
+            shared.sqlSubmitQueue.put(v)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            data = '{"inboxMessages":['
+            for row in queryreturn:
+                msgid, toAddress, fromAddress, subject, received, message, encodingtype= row
+                subject = shared.fixPotentiallyInvalidUTF8Data(subject)
+                message = shared.fixPotentiallyInvalidUTF8Data(message)
+                if len(data) > 25:
+                    data += ','
+                data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':encodingtype,'receivedTime':received},indent=4, separators=(',', ': '))
+            data += ']}'
+            return data
+        elif method == 'getSentMessageById':
+            if len(params) == 0:
+                return 'API Error 0000: I need parameters!'
+            msgid = params[0].decode('hex')
+            v = (msgid,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent WHERE msgid=?''')
+            shared.sqlSubmitQueue.put(v)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            data = '{"sentMessage":['
+            for row in queryreturn:
+                msgid, toAddress, fromAddress, subject, lastactiontime, message, encodingtype, status, ackdata = row
+                subject = shared.fixPotentiallyInvalidUTF8Data(subject)
+                message = shared.fixPotentiallyInvalidUTF8Data(message)
+                data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':encodingtype,'lastActionTime':lastactiontime,'status':status,'ackData':ackdata.encode('hex')},indent=4, separators=(',', ': '))
+            data += ']}'
+            return data
+        elif method == 'getSentMessagesByAddress':
+            if len(params) == 0:
+                return 'API Error 0000: I need parameters!'
+            fromAddress = params[0]
+            v = (fromAddress,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent WHERE folder='sent' AND fromAddress=? ORDER BY lastactiontime''')
+            shared.sqlSubmitQueue.put(v)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            data = '{"sentMessages":['
+            for row in queryreturn:
+                msgid, toAddress, fromAddress, subject, lastactiontime, message, encodingtype, status, ackdata = row
+                subject = shared.fixPotentiallyInvalidUTF8Data(subject)
+                message = shared.fixPotentiallyInvalidUTF8Data(message)
+                if len(data) > 25:
+                    data += ','
+                data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':encodingtype,'lastActionTime':lastactiontime,'status':status,'ackData':ackdata.encode('hex')},indent=4, separators=(',', ': '))
+            data += ']}'
+            return data
+        elif method == 'getSentMessageByAckData':
+            if len(params) == 0:
+                return 'API Error 0000: I need parameters!'
+            ackData = params[0].decode('hex')
+            v = (ackData,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent WHERE ackdata=?''')
+            shared.sqlSubmitQueue.put(v)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            data = '{"sentMessage":['
+            for row in queryreturn:
+                msgid, toAddress, fromAddress, subject, lastactiontime, message, encodingtype, status, ackdata = row
+                subject = shared.fixPotentiallyInvalidUTF8Data(subject)
+                message = shared.fixPotentiallyInvalidUTF8Data(message)
+                data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':encodingtype,'lastActionTime':lastactiontime,'status':status,'ackData':ackdata.encode('hex')},indent=4, separators=(',', ': '))
+            data += ']}'
+            return data
+        elif (method == 'trashMessage') or (method == 'trashInboxMessage'):
+            if len(params) == 0:
+                return 'API Error 0000: I need parameters!'
+            msgid = params[0].decode('hex')
+            helper_inbox.trash(msgid)
+            return 'Trashed inbox message (assuming message existed).'
+        elif method == 'trashSentMessage':
             if len(params) == 0:
                 return 'API Error 0000: I need parameters!'
             msgid = params[0].decode('hex')
             t = (msgid,)
             shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
+            shared.sqlSubmitQueue.put('''UPDATE sent SET folder='trash' WHERE msgid=?''')
-                '''UPDATE inbox SET folder='trash' WHERE msgid=?''')
             shared.sqlSubmitQueue.put(t)
             shared.sqlReturnQueue.get()
             shared.sqlSubmitQueue.put('commit')
             shared.sqlLock.release()
-            shared.UISignalQueue.put(('removeInboxRowByMsgid', msgid))
+            #shared.UISignalQueue.put(('removeSentRowByMsgid',msgid)) This function doesn't exist yet.
-            return 'Trashed message (assuming message existed).'
+            return 'Trashed sent message (assuming message existed).'
         elif method == 'sendMessage':
             if len(params) == 0:
                 return 'API Error 0000: I need parameters!'
@@ -4428,9 +471,9 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             status, addressVersionNumber, streamNumber, toRipe = decodeAddress(
                 toAddress)
             if status != 'success':
-                shared.printLock.acquire()
+                with shared.printLock:
-                print 'API Error 0007: Could not decode address:', toAddress, ':', status
+                    print 'API Error 0007: Could not decode address:', toAddress, ':', status
-                shared.printLock.release()
+
                 if status == 'checksumfailed':
                     return 'API Error 0008: Checksum failed for address: ' + toAddress
                 if status == 'invalidcharacters':
@@ -4445,9 +488,9 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             status, addressVersionNumber, streamNumber, fromRipe = decodeAddress(
                 fromAddress)
             if status != 'success':
-                shared.printLock.acquire()
+                with shared.printLock:
-                print 'API Error 0007: Could not decode address:', fromAddress, ':', status
+                    print 'API Error 0007: Could not decode address:', fromAddress, ':', status
-                shared.printLock.release()
+
                 if status == 'checksumfailed':
                     return 'API Error 0008: Checksum failed for address: ' + fromAddress
                 if status == 'invalidcharacters':
@@ -4470,15 +513,10 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 return 'API Error 0014: Your fromAddress is disabled. Cannot send.'
 
             ackdata = OpenSSL.rand(32)
-            shared.sqlLock.acquire()
+            
             t = ('', toAddress, toRipe, fromAddress, subject, message, ackdata, int(
                 time.time()), 'msgqueued', 1, 1, 'sent', 2)
-            shared.sqlSubmitQueue.put(
+            helper_sent.insert(t)
-                '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
 
             toLabel = ''
             t = (toAddress,)
@@ -4515,9 +553,9 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             status, addressVersionNumber, streamNumber, fromRipe = decodeAddress(
                 fromAddress)
             if status != 'success':
-                shared.printLock.acquire()
+                with shared.printLock:
-                print 'API Error 0007: Could not decode address:', fromAddress, ':', status
+                    print 'API Error 0007: Could not decode address:', fromAddress, ':', status
-                shared.printLock.release()
+
                 if status == 'checksumfailed':
                     return 'API Error 0008: Checksum failed for address: ' + fromAddress
                 if status == 'invalidcharacters':
@@ -4539,15 +577,10 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             toAddress = '[Broadcast subscribers]'
             ripe = ''
 
-            shared.sqlLock.acquire()
+            
             t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int(
                 time.time()), 'broadcastqueued', 1, 1, 'sent', 2)
-            shared.sqlSubmitQueue.put(
+            helper_sent.insert(t)
-                '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
-            shared.sqlSubmitQueue.put(t)
-            shared.sqlReturnQueue.get()
-            shared.sqlSubmitQueue.put('commit')
-            shared.sqlLock.release()
 
             toLabel = '[Broadcast subscribers]'
             shared.UISignalQueue.put(('displayNewSentMessage', (
@@ -4591,9 +624,9 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             status, addressVersionNumber, streamNumber, toRipe = decodeAddress(
                 address)
             if status != 'success':
-                shared.printLock.acquire()
+                with shared.printLock:
-                print 'API Error 0007: Could not decode address:', address, ':', status
+                    print 'API Error 0007: Could not decode address:', address, ':', status
-                shared.printLock.release()
+
                 if status == 'checksumfailed':
                     return 'API Error 0008: Checksum failed for address: ' + address
                 if status == 'invalidcharacters':
@@ -4665,36 +698,14 @@ class singleAPI(threading.Thread):
         se.register_introspection_functions()
         se.serve_forever()
 
-# This is used so that the _translate function can be used when we are in daemon mode and not using any QT functions.
-class translateClass:
-    def __init__(self, context, text):
-        self.context = context
-        self.text = text
-    def arg(self,argument):
-        if '%' in self.text:
-            return translateClass(self.context, self.text.replace('%','',1)) # This doesn't actually do anything with the arguments because we don't have a UI in which to display this information anyway.
-        else:
-            return self.text
-
-
 selfInitiatedConnections = {}
     # This is a list of current connections (the thread pointers at least)
-alreadyAttemptedConnectionsList = {
-}  # This is a list of nodes to which we have already attempted a connection
-ackdataForWhichImWatching = {}
-alreadyAttemptedConnectionsListLock = threading.Lock()
-eightBytesOfRandomDataUsedToDetectConnectionsToSelf = pack(
-    '>Q', random.randrange(1, 18446744073709551615))
-neededPubkeys = {}
-successfullyDecryptMessageTimings = [
-]  # A list of the amounts of time it took to successfully decrypt msg messages
-apiAddressGeneratorReturnQueue = Queue.Queue(
-)  # The address generator thread uses this queue to get information back to the API thread.
-alreadyAttemptedConnectionsListResetTime = int(
-    time.time())  # used to clear out the alreadyAttemptedConnectionsList periodically so that we will retry connecting to hosts to which we have already tried to connect.
-numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer = {}
 
-if useVeryEasyProofOfWorkForTesting:
+
+
+
+
+if shared.useVeryEasyProofOfWorkForTesting:
     shared.networkDefaultProofOfWorkNonceTrialsPerByte = int(
         shared.networkDefaultProofOfWorkNonceTrialsPerByte / 16)
     shared.networkDefaultPayloadLengthExtraBytes = int(
@@ -4704,137 +715,12 @@ if __name__ == "__main__":
     # is the application already running?  If yes then exit.
     thisapp = singleton.singleinstance()
 
-    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGINT, helper_generic.signal_handler)
     # signal.signal(signal.SIGINT, signal.SIG_DFL)
 
-    # Check the Major version, the first element in the array
+    helper_bootstrap.knownNodes()
-    if sqlite3.sqlite_version_info[0] < 3:
+    helper_bootstrap.dns()
-        print 'This program requires sqlite version 3 or higher because 2 and lower cannot store NULL values. I see version:', sqlite3.sqlite_version_info
-        os._exit(0)
 
-    # First try to load the config file (the keys.dat file) from the program
-    # directory
-    shared.config = ConfigParser.SafeConfigParser()
-    shared.config.read('keys.dat')
-    try:
-        shared.config.get('bitmessagesettings', 'settingsversion')
-        print 'Loading config files from same directory as program'
-        shared.appdata = ''
-    except:
-        # Could not load the keys.dat file in the program directory. Perhaps it
-        # is in the appdata directory.
-        shared.appdata = shared.lookupAppdataFolder()
-        shared.config = ConfigParser.SafeConfigParser()
-        shared.config.read(shared.appdata + 'keys.dat')
-        try:
-            shared.config.get('bitmessagesettings', 'settingsversion')
-            print 'Loading existing config files from', shared.appdata
-        except:
-            # This appears to be the first time running the program; there is
-            # no config file (or it cannot be accessed). Create config file.
-            shared.config.add_section('bitmessagesettings')
-            shared.config.set('bitmessagesettings', 'settingsversion', '6')
-            shared.config.set('bitmessagesettings', 'port', '8444')
-            shared.config.set(
-                'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y  %%I:%%M %%p')
-            shared.config.set('bitmessagesettings', 'blackwhitelist', 'black')
-            shared.config.set('bitmessagesettings', 'startonlogon', 'false')
-            if 'linux' in sys.platform:
-                shared.config.set(
-                    'bitmessagesettings', 'minimizetotray', 'false')
-                                  # This isn't implimented yet and when True on
-                                  # Ubuntu causes Bitmessage to disappear while
-                                  # running when minimized.
-            else:
-                shared.config.set(
-                    'bitmessagesettings', 'minimizetotray', 'true')
-            shared.config.set(
-                'bitmessagesettings', 'showtraynotifications', 'true')
-            shared.config.set('bitmessagesettings', 'startintray', 'false')
-            shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
-            shared.config.set(
-                'bitmessagesettings', 'sockshostname', 'localhost')
-            shared.config.set('bitmessagesettings', 'socksport', '9050')
-            shared.config.set(
-                'bitmessagesettings', 'socksauthentication', 'false')
-            shared.config.set('bitmessagesettings', 'socksusername', '')
-            shared.config.set('bitmessagesettings', 'sockspassword', '')
-            shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
-            shared.config.set(
-                'bitmessagesettings', 'messagesencrypted', 'false')
-            shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
-                shared.networkDefaultProofOfWorkNonceTrialsPerByte))
-            shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
-                shared.networkDefaultPayloadLengthExtraBytes))
-            shared.config.set('bitmessagesettings', 'minimizeonclose', 'false')
-            shared.config.set(
-                'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
-            shared.config.set(
-                'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
-
-            if storeConfigFilesInSameDirectoryAsProgramByDefault:
-                # Just use the same directory as the program and forget about
-                # the appdata folder
-                shared.appdata = ''
-                print 'Creating new config files in same directory as program.'
-            else:
-                print 'Creating new config files in', shared.appdata
-                if not os.path.exists(shared.appdata):
-                    os.makedirs(shared.appdata)
-            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-                shared.config.write(configfile)
-
-    if shared.config.getint('bitmessagesettings', 'settingsversion') == 1:
-        shared.config.set('bitmessagesettings', 'settingsversion', '4')
-                          # If the settings version is equal to 2 or 3 then the
-                          # sqlThread will modify the pubkeys table and change
-                          # the settings version to 4.
-        shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
-        shared.config.set('bitmessagesettings', 'sockshostname', 'localhost')
-        shared.config.set('bitmessagesettings', 'socksport', '9050')
-        shared.config.set('bitmessagesettings', 'socksauthentication', 'false')
-        shared.config.set('bitmessagesettings', 'socksusername', '')
-        shared.config.set('bitmessagesettings', 'sockspassword', '')
-        shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
-        shared.config.set('bitmessagesettings', 'messagesencrypted', 'false')
-        with open(shared.appdata + 'keys.dat', 'wb') as configfile:
-            shared.config.write(configfile)
-
-    try:
-        # We shouldn't have to use the shared.knownNodesLock because this had
-        # better be the only thread accessing knownNodes right now.
-        pickleFile = open(shared.appdata + 'knownnodes.dat', 'rb')
-        shared.knownNodes = pickle.load(pickleFile)
-        pickleFile.close()
-    except:
-        createDefaultKnownNodes(shared.appdata)
-        pickleFile = open(shared.appdata + 'knownnodes.dat', 'rb')
-        shared.knownNodes = pickle.load(pickleFile)
-        pickleFile.close()
-    if shared.config.getint('bitmessagesettings', 'settingsversion') > 6:
-        print 'Bitmessage cannot read future versions of the keys file (keys.dat). Run the newer version of Bitmessage.'
-        raise SystemExit
-
-    # DNS bootstrap. This could be programmed to use the SOCKS proxy to do the
-    # DNS lookup some day but for now we will just rely on the entries in
-    # defaultKnownNodes.py. Hopefully either they are up to date or the user
-    # has run Bitmessage recently without SOCKS turned on and received good
-    # bootstrap nodes using that method.
-    if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none':
-        try:
-            for item in socket.getaddrinfo('bootstrap8080.bitmessage.org', 80):
-                print 'Adding', item[4][0], 'to knownNodes based on DNS boostrap method'
-                shared.knownNodes[1][item[4][0]] = (8080, int(time.time()))
-        except:
-            print 'bootstrap8080.bitmessage.org DNS bootstraping failed.'
-        try:
-            for item in socket.getaddrinfo('bootstrap8444.bitmessage.org', 80):
-                print 'Adding', item[4][0], 'to knownNodes based on DNS boostrap method'
-                shared.knownNodes[1][item[4][0]] = (8444, int(time.time()))
-        except:
-            print 'bootstrap8444.bitmessage.org DNS bootstrapping failed.'
-    else:
-        print 'DNS bootstrap skipped because SOCKS is used.'
     # Start the address generation thread
     addressGeneratorThread = addressGenerator()
     addressGeneratorThread.daemon = True  # close the main program even if there are threads left
@@ -4865,9 +751,9 @@ if __name__ == "__main__":
         except:
             apiNotifyPath = ''
         if apiNotifyPath != '':
-            shared.printLock.acquire()
+            with shared.printLock:
-            print 'Trying to call', apiNotifyPath
+                print 'Trying to call', apiNotifyPath
-            shared.printLock.release()
+
             call([apiNotifyPath, "startingUp"])
         singleAPIThread = singleAPI()
         singleAPIThread.daemon = True  # close the main program even if there are threads left
@@ -4883,41 +769,27 @@ if __name__ == "__main__":
     connectToStream(1)
 
     singleListenerThread = singleListener()
+    singleListenerThread.setup(selfInitiatedConnections)
     singleListenerThread.daemon = True  # close the main program even if there are threads left
     singleListenerThread.start()
 
     if not shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'):
         try:
-            from PyQt4.QtCore import *
-            from PyQt4.QtGui import *
             from PyQt4 import QtCore, QtGui
         except Exception as err:
             print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download PyQt from http://www.riverbankcomputing.com/software/pyqt/download   or by searching Google for \'PyQt Download\'. If you want to run in daemon mode, see https://bitmessage.org/wiki/Daemon'
             print 'Error message:', err
             os._exit(0)
 
-        try:
-            _encoding = QtGui.QApplication.UnicodeUTF8
-            def _translate(context, text): # A non-QT version of _translate is defined below.
-                return QtGui.QApplication.translate(context, text)
-        except Exception as err:
-            print 'Error:', err
-
         import bitmessageqt
         bitmessageqt.run()
     else:
-        def _translate(context, text): # A QT version of _translate is defined above. 
+        with shared.printLock:
-            if '%' in text:
+            print 'Running as a daemon. You can use Ctrl+C to exit.'
-                return translateClass(context, text.replace('%','',1))
+
-            else:
-                return text
-        shared.printLock.acquire()
-        print 'Running as a daemon. You can use Ctrl+C to exit.'
-        shared.printLock.release()
         while True:
             time.sleep(20)
 
-
 # So far, the creation of and management of the Bitmessage protocol and this
 # client is a one-man operation. Bitcoin tips are quite appreciated.
 # 1H5XaDA6fYENLbknwZyjiYXYPQaFjjLX2u

src/bitmessageqt/__init__.py

@@ -3,25 +3,6 @@ try:
 except:
     pass
 
-try:
-    from PyQt4 import QtCore, QtGui
-    from PyQt4.QtCore import *
-    from PyQt4.QtGui import *
-except Exception as err:
-    print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).'
-    print 'Error message:', err
-    sys.exit()
-
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-except AttributeError:
-    print 'QtGui.QApplication.UnicodeUTF8 error:', err
-
-def _translate(context, text):
-    return QtGui.QApplication.translate(context, text)
-
-
 withMessagingMenu = False
 try:
     from gi.repository import MessagingMenu
@@ -49,6 +30,23 @@ from pyelliptic.openssl import OpenSSL
 import pickle
 import platform
 
+try:
+    from PyQt4 import QtCore, QtGui
+    from PyQt4.QtCore import *
+    from PyQt4.QtGui import *
+except Exception as err:
+    print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).'
+    print 'Error message:', err
+    sys.exit()
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+except AttributeError:
+    print 'QtGui.QApplication.UnicodeUTF8 error:', err
+
+def _translate(context, text):
+    return QtGui.QApplication.translate(context, text)
+
 
 class MyForm(QtGui.QMainWindow):
 
@@ -310,205 +308,10 @@ class MyForm(QtGui.QMainWindow):
                         addressInKeysFile)
 
         # Load inbox from messages database file
-        font = QFont()
+        self.loadInbox()
-        font.setBold(True)
-        shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put(
-            '''SELECT msgid, toaddress, fromaddress, subject, received, message, read FROM inbox where folder='inbox' ORDER BY received''')
-        shared.sqlSubmitQueue.put('')
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        for row in queryreturn:
-            msgid, toAddress, fromAddress, subject, received, message, read = row
-            subject = shared.fixPotentiallyInvalidUTF8Data(subject)
-            message = shared.fixPotentiallyInvalidUTF8Data(message)
-            try:
-                if toAddress == self.str_broadcast_subscribers:
-                    toLabel = self.str_broadcast_subscribers
-                else:
-                    toLabel = shared.config.get(toAddress, 'label')
-            except:
-                toLabel = ''
-            if toLabel == '':
-                toLabel = toAddress
-
-            fromLabel = ''
-            t = (fromAddress,)
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''select label from addressbook where address=?''')
-            shared.sqlSubmitQueue.put(t)
-            queryreturn = shared.sqlReturnQueue.get()
-            shared.sqlLock.release()
-
-            if queryreturn != []:
-                for row in queryreturn:
-                    fromLabel, = row
-
-            if fromLabel == '':  # If this address wasn't in our address book...
-                t = (fromAddress,)
-                shared.sqlLock.acquire()
-                shared.sqlSubmitQueue.put(
-                    '''select label from subscriptions where address=?''')
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlLock.release()
-
-                if queryreturn != []:
-                    for row in queryreturn:
-                        fromLabel, = row
-
-            self.ui.tableWidgetInbox.insertRow(0)
-            newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8'))
-            newItem.setToolTip(unicode(toLabel, 'utf-8'))
-            newItem.setFlags(
-                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
-            if not read:
-                newItem.setFont(font)
-            newItem.setData(Qt.UserRole, str(toAddress))
-            if shared.safeConfigGetBoolean(toAddress, 'mailinglist'):
-                newItem.setTextColor(QtGui.QColor(137, 04, 177))
-            self.ui.tableWidgetInbox.setItem(0, 0, newItem)
-            if fromLabel == '':
-                newItem = QtGui.QTableWidgetItem(
-                    unicode(fromAddress, 'utf-8'))
-                newItem.setToolTip(unicode(fromAddress, 'utf-8'))
-            else:
-                newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
-                newItem.setToolTip(unicode(fromLabel, 'utf-8'))
-            newItem.setFlags(
-                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
-            if not read:
-                newItem.setFont(font)
-            newItem.setData(Qt.UserRole, str(fromAddress))
-
-            self.ui.tableWidgetInbox.setItem(0, 1, newItem)
-            newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8'))
-            newItem.setToolTip(unicode(subject, 'utf-8'))
-            newItem.setData(Qt.UserRole, unicode(message, 'utf-8)'))
-            newItem.setFlags(
-                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
-            if not read:
-                newItem.setFont(font)
-            self.ui.tableWidgetInbox.setItem(0, 2, newItem)
-            newItem = myTableWidgetItem(unicode(strftime(shared.config.get(
-                'bitmessagesettings', 'timeformat'), localtime(int(received))), 'utf-8'))
-            newItem.setToolTip(unicode(strftime(shared.config.get(
-                'bitmessagesettings', 'timeformat'), localtime(int(received))), 'utf-8'))
-            newItem.setData(Qt.UserRole, QByteArray(msgid))
-            newItem.setData(33, int(received))
-            newItem.setFlags(
-                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
-            if not read:
-                newItem.setFont(font)
-            self.ui.tableWidgetInbox.setItem(0, 3, newItem)
-        self.ui.tableWidgetInbox.sortItems(3, Qt.DescendingOrder)
-        self.ui.tableWidgetInbox.keyPressEvent = self.tableWidgetInboxKeyPressEvent
 
         # Load Sent items from database
-        shared.sqlLock.acquire()
+        self.loadSent()
-        shared.sqlSubmitQueue.put(
-            '''SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime FROM sent where folder = 'sent' ORDER BY lastactiontime''')
-        shared.sqlSubmitQueue.put('')
-        queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlLock.release()
-        for row in queryreturn:
-            toAddress, fromAddress, subject, message, status, ackdata, lastactiontime = row
-            subject = shared.fixPotentiallyInvalidUTF8Data(subject)
-            message = shared.fixPotentiallyInvalidUTF8Data(message)
-            try:
-                fromLabel = shared.config.get(fromAddress, 'label')
-            except:
-                fromLabel = ''
-            if fromLabel == '':
-                fromLabel = fromAddress
-
-            toLabel = ''
-            t = (toAddress,)
-            shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put(
-                '''select label from addressbook where address=?''')
-            shared.sqlSubmitQueue.put(t)
-            queryreturn = shared.sqlReturnQueue.get()
-            shared.sqlLock.release()
-
-            if queryreturn != []:
-                for row in queryreturn:
-                    toLabel, = row
-
-            self.ui.tableWidgetSent.insertRow(0)
-            if toLabel == '':
-                newItem = QtGui.QTableWidgetItem(unicode(toAddress, 'utf-8'))
-                newItem.setToolTip(unicode(toAddress, 'utf-8'))
-            else:
-                newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8'))
-                newItem.setToolTip(unicode(toLabel, 'utf-8'))
-            newItem.setData(Qt.UserRole, str(toAddress))
-            newItem.setFlags(
-                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
-            self.ui.tableWidgetSent.setItem(0, 0, newItem)
-            if fromLabel == '':
-                newItem = QtGui.QTableWidgetItem(
-                    unicode(fromAddress, 'utf-8'))
-                newItem.setToolTip(unicode(fromAddress, 'utf-8'))
-            else:
-                newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
-                newItem.setToolTip(unicode(fromLabel, 'utf-8'))
-            newItem.setData(Qt.UserRole, str(fromAddress))
-            newItem.setFlags(
-                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
-            self.ui.tableWidgetSent.setItem(0, 1, newItem)
-            newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8'))
-            newItem.setToolTip(unicode(subject, 'utf-8'))
-            newItem.setData(Qt.UserRole, unicode(message, 'utf-8)'))
-            newItem.setFlags(
-                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
-            self.ui.tableWidgetSent.setItem(0, 2, newItem)
-            if status == 'awaitingpubkey':
-                statusText = _translate(
-                    "MainWindow", "Waiting on their encryption key. Will request it again soon.")
-            elif status == 'doingpowforpubkey':
-                statusText = _translate(
-                    "MainWindow", "Encryption key request queued.")
-            elif status == 'msgqueued':
-                statusText = _translate(
-                    "MainWindow", "Queued.")
-            elif status == 'msgsent':
-                statusText = _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent at %1").arg(
-                    unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
-            elif status == 'doingmsgpow':
-                statusText = _translate(
-                    "MainWindow", "Need to do work to send message. Work is queued.")
-            elif status == 'ackreceived':
-                statusText = _translate("MainWindow", "Acknowledgement of the message received %1").arg(
-                    unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
-            elif status == 'broadcastqueued':
-                statusText = _translate(
-                    "MainWindow", "Broadcast queued.")
-            elif status == 'broadcastsent':
-                statusText = _translate("MainWindow", "Broadcast on %1").arg(unicode(strftime(
-                    shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
-            elif status == 'toodifficult':
-                statusText = _translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg(
-                    unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
-            elif status == 'badkey':
-                statusText = _translate("MainWindow", "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg(
-                    unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
-            elif status == 'forcepow':
-                statusText = _translate(
-                    "MainWindow", "Forced difficulty override. Send should start soon.")
-            else:
-                statusText = _translate("MainWindow", "Unknown status: %1 %2").arg(status).arg(unicode(
-                    strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
-            newItem = myTableWidgetItem(statusText)
-            newItem.setToolTip(statusText)
-            newItem.setData(Qt.UserRole, QByteArray(ackdata))
-            newItem.setData(33, int(lastactiontime))
-            newItem.setFlags(
-                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
-            self.ui.tableWidgetSent.setItem(0, 3, newItem)
-        self.ui.tableWidgetSent.sortItems(3, Qt.DescendingOrder)
-        self.ui.tableWidgetSent.keyPressEvent = self.tableWidgetSentKeyPressEvent
 
         # Initialize the address book
         shared.sqlLock.acquire()
@@ -529,6 +332,14 @@ class MyForm(QtGui.QMainWindow):
         # Initialize the Subscriptions
         self.rerenderSubscriptions()
 
+        # Initialize the inbox search
+        QtCore.QObject.connect(self.ui.inboxSearchLineEdit, QtCore.SIGNAL(
+            "returnPressed()"), self.inboxSearchLineEditPressed)
+
+        # Initialize the sent search
+        QtCore.QObject.connect(self.ui.sentSearchLineEdit, QtCore.SIGNAL(
+            "returnPressed()"), self.sentSearchLineEditPressed)
+
         # Initialize the Blacklist or Whitelist
         if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black':
             self.loadBlackWhiteList()
@@ -688,6 +499,251 @@ class MyForm(QtGui.QMainWindow):
         self.appIndicatorShow()
         self.ui.tabWidget.setCurrentIndex(5)
 
+    # Load Sent items from database
+    def loadSent(self, where="", what=""):
+        what = "%" + what + "%"
+        if where == "To":
+            where = "toaddress"
+        elif where == "From":
+            where = "fromaddress"
+        elif where == "Subject":
+            where = "subject"
+        elif where == "Message":
+            where = "message"
+        else:
+            where = "toaddress || fromaddress || subject || message"
+
+        sqlQuery = '''
+            SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime 
+            FROM sent WHERE folder="sent" AND %s LIKE ? 
+            ORDER BY lastactiontime
+            ''' % (where,)
+
+        while self.ui.tableWidgetSent.rowCount() > 0:
+            self.ui.tableWidgetSent.removeRow(0)
+
+        t = (what,)
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put(sqlQuery)
+        shared.sqlSubmitQueue.put(t)
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        for row in queryreturn:
+            toAddress, fromAddress, subject, message, status, ackdata, lastactiontime = row
+            subject = shared.fixPotentiallyInvalidUTF8Data(subject)
+            message = shared.fixPotentiallyInvalidUTF8Data(message)
+            try:
+                fromLabel = shared.config.get(fromAddress, 'label')
+            except:
+                fromLabel = ''
+            if fromLabel == '':
+                fromLabel = fromAddress
+
+            toLabel = ''
+            t = (toAddress,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''select label from addressbook where address=?''')
+            shared.sqlSubmitQueue.put(t)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+
+            if queryreturn != []:
+                for row in queryreturn:
+                    toLabel, = row
+
+            self.ui.tableWidgetSent.insertRow(0)
+            if toLabel == '':
+                newItem = QtGui.QTableWidgetItem(unicode(toAddress, 'utf-8'))
+                newItem.setToolTip(unicode(toAddress, 'utf-8'))
+            else:
+                newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8'))
+                newItem.setToolTip(unicode(toLabel, 'utf-8'))
+            newItem.setData(Qt.UserRole, str(toAddress))
+            newItem.setFlags(
+                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+            self.ui.tableWidgetSent.setItem(0, 0, newItem)
+            if fromLabel == '':
+                newItem = QtGui.QTableWidgetItem(
+                    unicode(fromAddress, 'utf-8'))
+                newItem.setToolTip(unicode(fromAddress, 'utf-8'))
+            else:
+                newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
+                newItem.setToolTip(unicode(fromLabel, 'utf-8'))
+            newItem.setData(Qt.UserRole, str(fromAddress))
+            newItem.setFlags(
+                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+            self.ui.tableWidgetSent.setItem(0, 1, newItem)
+            newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8'))
+            newItem.setToolTip(unicode(subject, 'utf-8'))
+            newItem.setData(Qt.UserRole, unicode(message, 'utf-8)'))
+            newItem.setFlags(
+                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+            self.ui.tableWidgetSent.setItem(0, 2, newItem)
+            if status == 'awaitingpubkey':
+                statusText = _translate(
+                    "MainWindow", "Waiting on their encryption key. Will request it again soon.")
+            elif status == 'doingpowforpubkey':
+                statusText = _translate(
+                    "MainWindow", "Encryption key request queued.")
+            elif status == 'msgqueued':
+                statusText = _translate(
+                    "MainWindow", "Queued.")
+            elif status == 'msgsent':
+                statusText = _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent at %1").arg(
+                    unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
+            elif status == 'doingmsgpow':
+                statusText = _translate(
+                    "MainWindow", "Need to do work to send message. Work is queued.")
+            elif status == 'ackreceived':
+                statusText = _translate("MainWindow", "Acknowledgement of the message received %1").arg(
+                    unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
+            elif status == 'broadcastqueued':
+                statusText = _translate(
+                    "MainWindow", "Broadcast queued.")
+            elif status == 'broadcastsent':
+                statusText = _translate("MainWindow", "Broadcast on %1").arg(unicode(strftime(
+                    shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
+            elif status == 'toodifficult':
+                statusText = _translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg(
+                    unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
+            elif status == 'badkey':
+                statusText = _translate("MainWindow", "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg(
+                    unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
+            elif status == 'forcepow':
+                statusText = _translate(
+                    "MainWindow", "Forced difficulty override. Send should start soon.")
+            else:
+                statusText = _translate("MainWindow", "Unknown status: %1 %2").arg(status).arg(unicode(
+                    strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
+            newItem = myTableWidgetItem(statusText)
+            newItem.setToolTip(statusText)
+            newItem.setData(Qt.UserRole, QByteArray(ackdata))
+            newItem.setData(33, int(lastactiontime))
+            newItem.setFlags(
+                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+            self.ui.tableWidgetSent.setItem(0, 3, newItem)
+        self.ui.tableWidgetSent.sortItems(3, Qt.DescendingOrder)
+        self.ui.tableWidgetSent.keyPressEvent = self.tableWidgetSentKeyPressEvent
+
+    # Load inbox from messages database file
+    def loadInbox(self, where="", what=""):
+        what = "%" + what + "%"
+        if where == "To":
+            where = "toaddress"
+        elif where == "From":
+            where = "fromaddress"
+        elif where == "Subject":
+            where = "subject"
+        elif where == "Message":
+            where = "message"
+        else:
+            where = "toaddress || fromaddress || subject || message"
+
+        sqlQuery = '''
+            SELECT msgid, toaddress, fromaddress, subject, received, message, read 
+            FROM inbox WHERE folder="inbox" AND %s LIKE ? 
+            ORDER BY received
+            ''' % (where,)
+
+        while self.ui.tableWidgetInbox.rowCount() > 0:
+            self.ui.tableWidgetInbox.removeRow(0)
+
+        font = QFont()
+        font.setBold(True)
+        t = (what,)
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put(sqlQuery)
+        shared.sqlSubmitQueue.put(t)
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        for row in queryreturn:
+            msgid, toAddress, fromAddress, subject, received, message, read = row
+            subject = shared.fixPotentiallyInvalidUTF8Data(subject)
+            message = shared.fixPotentiallyInvalidUTF8Data(message)
+            try:
+                if toAddress == self.str_broadcast_subscribers:
+                    toLabel = self.str_broadcast_subscribers
+                else:
+                    toLabel = shared.config.get(toAddress, 'label')
+            except:
+                toLabel = ''
+            if toLabel == '':
+                toLabel = toAddress
+
+            fromLabel = ''
+            t = (fromAddress,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''select label from addressbook where address=?''')
+            shared.sqlSubmitQueue.put(t)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+
+            if queryreturn != []:
+                for row in queryreturn:
+                    fromLabel, = row
+
+            if fromLabel == '':  # If this address wasn't in our address book...
+                t = (fromAddress,)
+                shared.sqlLock.acquire()
+                shared.sqlSubmitQueue.put(
+                    '''select label from subscriptions where address=?''')
+                shared.sqlSubmitQueue.put(t)
+                queryreturn = shared.sqlReturnQueue.get()
+                shared.sqlLock.release()
+
+                if queryreturn != []:
+                    for row in queryreturn:
+                        fromLabel, = row
+
+            self.ui.tableWidgetInbox.insertRow(0)
+            newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8'))
+            newItem.setToolTip(unicode(toLabel, 'utf-8'))
+            newItem.setFlags(
+                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+            if not read:
+                newItem.setFont(font)
+            newItem.setData(Qt.UserRole, str(toAddress))
+            if shared.safeConfigGetBoolean(toAddress, 'mailinglist'):
+                newItem.setTextColor(QtGui.QColor(137, 04, 177))
+            self.ui.tableWidgetInbox.setItem(0, 0, newItem)
+            if fromLabel == '':
+                newItem = QtGui.QTableWidgetItem(
+                    unicode(fromAddress, 'utf-8'))
+                newItem.setToolTip(unicode(fromAddress, 'utf-8'))
+            else:
+                newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
+                newItem.setToolTip(unicode(fromLabel, 'utf-8'))
+            newItem.setFlags(
+                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+            if not read:
+                newItem.setFont(font)
+            newItem.setData(Qt.UserRole, str(fromAddress))
+
+            self.ui.tableWidgetInbox.setItem(0, 1, newItem)
+            newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8'))
+            newItem.setToolTip(unicode(subject, 'utf-8'))
+            newItem.setData(Qt.UserRole, unicode(message, 'utf-8)'))
+            newItem.setFlags(
+                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+            if not read:
+                newItem.setFont(font)
+            self.ui.tableWidgetInbox.setItem(0, 2, newItem)
+            newItem = myTableWidgetItem(unicode(strftime(shared.config.get(
+                'bitmessagesettings', 'timeformat'), localtime(int(received))), 'utf-8'))
+            newItem.setToolTip(unicode(strftime(shared.config.get(
+                'bitmessagesettings', 'timeformat'), localtime(int(received))), 'utf-8'))
+            newItem.setData(Qt.UserRole, QByteArray(msgid))
+            newItem.setData(33, int(received))
+            newItem.setFlags(
+                QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+            if not read:
+                newItem.setFont(font)
+            self.ui.tableWidgetInbox.setItem(0, 3, newItem)
+        self.ui.tableWidgetInbox.sortItems(3, Qt.DescendingOrder)
+        self.ui.tableWidgetInbox.keyPressEvent = self.tableWidgetInboxKeyPressEvent
+
     # create application indicator
     def appIndicatorInit(self, app):
         self.tray = QSystemTrayIcon(QtGui.QIcon(
@@ -1076,8 +1132,8 @@ class MyForm(QtGui.QMainWindow):
             shared.statusIconColor = 'red'
             # if the connection is lost then show a notification
             if self.connected:
-                self.notifierShow('Bitmessage', _translate(
+                self.notifierShow('Bitmessage', unicode(_translate(
-                    "MainWindow", "Connection lost"))
+                    "MainWindow", "Connection lost").toUtf8(),'utf-8'))
             self.connected = False
 
             if self.actionStatus is not None:
@@ -1093,8 +1149,8 @@ class MyForm(QtGui.QMainWindow):
             shared.statusIconColor = 'yellow'
             # if a new connection has been established then show a notification
             if not self.connected:
-                self.notifierShow('Bitmessage', _translate(
+                self.notifierShow('Bitmessage', unicode(_translate(
-                    "MainWindow", "Connected"))
+                    "MainWindow", "Connected").toUtf8(),'utf-8'))
             self.connected = True
 
             if self.actionStatus is not None:
@@ -1109,8 +1165,8 @@ class MyForm(QtGui.QMainWindow):
                 QIcon(":/newPrefix/images/greenicon.png"))
             shared.statusIconColor = 'green'
             if not self.connected:
-                self.notifierShow('Bitmessage', _translate(
+                self.notifierShow('Bitmessage', unicode(_translate(
-                    "MainWindow", "Connected"))
+                    "MainWindow", "Connected").toUtf8(),'utf-8'))
             self.connected = True
 
             if self.actionStatus is not None:
@@ -1290,9 +1346,9 @@ class MyForm(QtGui.QMainWindow):
                     status, addressVersionNumber, streamNumber, ripe = decodeAddress(
                         toAddress)
                     if status != 'success':
-                        shared.printLock.acquire()
+                        with shared.printLock:
-                        print 'Error: Could not decode', toAddress, ':', status
+                            print 'Error: Could not decode', toAddress, ':', status
-                        shared.printLock.release()
+
                         if status == 'missingbm':
                             self.statusBar().showMessage(_translate(
                                 "MainWindow", "Error: Bitmessage addresses start with BM-   Please check %1").arg(toAddress))
@@ -1582,12 +1638,12 @@ class MyForm(QtGui.QMainWindow):
             newItem = QtGui.QTableWidgetItem(unicode(fromAddress, 'utf-8'))
             newItem.setToolTip(unicode(fromAddress, 'utf-8'))
             if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'):
-                self.notifierShow('New Message', 'From ' + fromAddress)
+                self.notifierShow(unicode(_translate("MainWindow",'New Message').toUtf8(),'utf-8'), unicode(_translate("MainWindow",'From ').toUtf8(),'utf-8') + unicode(fromAddress, 'utf-8'))
         else:
             newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
             newItem.setToolTip(unicode(unicode(fromLabel, 'utf-8')))
             if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'):
-                self.notifierShow('New Message', 'From ' + fromLabel)
+                self.notifierShow(unicode(_translate("MainWindow",'New Message').toUtf8(),'utf-8'), unicode(_translate("MainWindow",'From ').toUtf8(),'utf-8') + unicode(fromLabel, 'utf-8'))
         newItem.setData(Qt.UserRole, str(fromAddress))
         newItem.setFont(font)
         self.ui.tableWidgetInbox.setItem(0, 1, newItem)
@@ -2509,6 +2565,20 @@ class MyForm(QtGui.QMainWindow):
             self.popMenuSent.addAction(self.actionForceSend)
         self.popMenuSent.exec_(self.ui.tableWidgetSent.mapToGlobal(point))
 
+    def inboxSearchLineEditPressed(self):
+        searchKeyword = self.ui.inboxSearchLineEdit.text().toUtf8().data()
+        searchOption = self.ui.inboxSearchOptionCB.currentText().toUtf8().data()
+        self.ui.inboxSearchLineEdit.setText(QString(""))
+        self.ui.textEditInboxMessage.setPlainText(QString(""))
+        self.loadInbox(searchOption, searchKeyword)
+
+    def sentSearchLineEditPressed(self):
+        searchKeyword = self.ui.sentSearchLineEdit.text().toUtf8().data()
+        searchOption = self.ui.sentSearchOptionCB.currentText().toUtf8().data()
+        self.ui.sentSearchLineEdit.setText(QString(""))
+        self.ui.textEditInboxMessage.setPlainText(QString(""))
+        self.loadSent(searchOption, searchKeyword)
+
     def tableWidgetInboxItemClicked(self):
         currentRow = self.ui.tableWidgetInbox.currentRow()
         if currentRow >= 0:
@@ -2623,9 +2693,9 @@ class MyForm(QtGui.QMainWindow):
 
     def updateStatusBar(self, data):
         if data != "":
-            shared.printLock.acquire()
+            with shared.printLock:
-            print 'Status bar:', data
+                print 'Status bar:', data
-            shared.printLock.release()
+
         self.statusBar().showMessage(data)
 
 
@@ -2682,12 +2752,12 @@ class settingsDialog(QtGui.QDialog):
             self.ui.checkBoxMinimizeToTray.setDisabled(True)
             self.ui.checkBoxShowTrayNotifications.setDisabled(True)
             self.ui.labelSettingsNote.setText(_translate(
-                "MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system."))
+                "MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implemented for your operating system."))
         elif 'linux' in sys.platform:
             self.ui.checkBoxStartOnLogon.setDisabled(True)
             self.ui.checkBoxMinimizeToTray.setDisabled(True)
             self.ui.labelSettingsNote.setText(_translate(
-                "MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system."))
+                "MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implemented for your operating system."))
         # On the Network settings tab:
         self.ui.lineEditTCPPort.setText(str(
             shared.config.get('bitmessagesettings', 'port')))
@@ -2846,6 +2916,16 @@ class NewAddressDialog(QtGui.QDialog):
         self.ui.groupBoxDeterministic.setHidden(True)
         QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
 
+class NewChanDialog(QtGui.QDialog):
+
+    def __init__(self, parent):
+        QtGui.QWidget.__init__(self, parent)
+        self.ui = Ui_NewChanDialog()
+        self.ui.setupUi(self)
+        self.parent = parent
+        self.ui.groupBoxCreateChan.setHidden(True)
+        QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))     
+
 
 class iconGlossaryDialog(QtGui.QDialog):
 
@@ -2867,66 +2947,90 @@ class myTableWidgetItem(QTableWidgetItem):
     def __lt__(self, other):
         return int(self.data(33).toPyObject()) < int(other.data(33).toPyObject())
 
-
+from threading import Thread
-class UISignaler(QThread):
+class UISignaler(Thread,QThread):
 
     def __init__(self, parent=None):
+        Thread.__init__(self, parent)
         QThread.__init__(self, parent)
 
     def run(self):
         while True:
-            command, data = shared.UISignalQueue.get()
+            try:
-            if command == 'writeNewAddressToTable':
+                command, data = shared.UISignalQueue.get()
-                label, address, streamNumber = data
+                if command == 'writeNewAddressToTable':
-                self.emit(SIGNAL(
+                    label, address, streamNumber = data
-                    "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), label, address, str(streamNumber))
+                    self.emit(SIGNAL(
-            elif command == 'updateStatusBar':
+                        "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), label, address, str(streamNumber))
-                self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"), data)
+                elif command == 'updateStatusBar':
-            elif command == 'updateSentItemStatusByHash':
+                    self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"), data)
-                hash, message = data
+                elif command == 'updateSentItemStatusByHash':
-                self.emit(SIGNAL(
+                    hash, message = data
-                    "updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), hash, message)
+                    self.emit(SIGNAL(
-            elif command == 'updateSentItemStatusByAckdata':
+                        "updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), hash, message)
-                ackData, message = data
+                elif command == 'updateSentItemStatusByAckdata':
-                self.emit(SIGNAL(
+                    ackData, message = data
-                    "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), ackData, message)
+                    self.emit(SIGNAL(
-            elif command == 'displayNewInboxMessage':
+                        "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), ackData, message)
-                inventoryHash, toAddress, fromAddress, subject, body = data
+                elif command == 'displayNewInboxMessage':
-                self.emit(SIGNAL(
+                    inventoryHash, toAddress, fromAddress, subject, body = data
-                    "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
+                    self.emit(SIGNAL(
-                    inventoryHash, toAddress, fromAddress, subject, body)
+                        "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
-            elif command == 'displayNewSentMessage':
+                        inventoryHash, toAddress, fromAddress, subject, body)
-                toAddress, fromLabel, fromAddress, subject, message, ackdata = data
+                elif command == 'displayNewSentMessage':
-                self.emit(SIGNAL(
+                    toAddress, fromLabel, fromAddress, subject, message, ackdata = data
-                    "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
+                    self.emit(SIGNAL(
-                    toAddress, fromLabel, fromAddress, subject, message, ackdata)
+                        "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
-            elif command == 'updateNetworkStatusTab':
+                        toAddress, fromLabel, fromAddress, subject, message, ackdata)
-                self.emit(SIGNAL("updateNetworkStatusTab()"))
+                elif command == 'updateNetworkStatusTab':
-            elif command == 'incrementNumberOfMessagesProcessed':
+                    self.emit(SIGNAL("updateNetworkStatusTab()"))
-                self.emit(SIGNAL("incrementNumberOfMessagesProcessed()"))
+                elif command == 'incrementNumberOfMessagesProcessed':
-            elif command == 'incrementNumberOfPubkeysProcessed':
+                    self.emit(SIGNAL("incrementNumberOfMessagesProcessed()"))
-                self.emit(SIGNAL("incrementNumberOfPubkeysProcessed()"))
+                elif command == 'incrementNumberOfPubkeysProcessed':
-            elif command == 'incrementNumberOfBroadcastsProcessed':
+                    self.emit(SIGNAL("incrementNumberOfPubkeysProcessed()"))
-                self.emit(SIGNAL("incrementNumberOfBroadcastsProcessed()"))
+                elif command == 'incrementNumberOfBroadcastsProcessed':
-            elif command == 'setStatusIcon':
+                    self.emit(SIGNAL("incrementNumberOfBroadcastsProcessed()"))
-                self.emit(SIGNAL("setStatusIcon(PyQt_PyObject)"), data)
+                elif command == 'setStatusIcon':
-            elif command == 'rerenderInboxFromLabels':
+                    self.emit(SIGNAL("setStatusIcon(PyQt_PyObject)"), data)
-                self.emit(SIGNAL("rerenderInboxFromLabels()"))
+                elif command == 'rerenderInboxFromLabels':
-            elif command == 'rerenderSubscriptions':
+                    self.emit(SIGNAL("rerenderInboxFromLabels()"))
-                self.emit(SIGNAL("rerenderSubscriptions()"))
+                elif command == 'rerenderSubscriptions':
-            elif command == 'removeInboxRowByMsgid':
+                    self.emit(SIGNAL("rerenderSubscriptions()"))
-                self.emit(SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"), data)
+                elif command == 'removeInboxRowByMsgid':
-            else:
+                    self.emit(SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"), data)
-                sys.stderr.write(
+                else:
-                    'Command sent to UISignaler not recognized: %s\n' % command)
+                    sys.stderr.write(
+                        'Command sent to UISignaler not recognized: %s\n' % command)
+            except Exception,ex:
+                # uncaught exception will block gevent
+                import traceback
+                traceback.print_exc()
+                traceback.print_stack()
+                print ex
+                pass
 
+try:
+    import gevent
+except ImportError as ex:
+    gevent = None
+else:
+    def mainloop(app):
+        while True:
+            app.processEvents()
+            gevent.sleep(0.01)
+    def testprint():
+        #print 'this is running'
+        gevent.spawn_later(1, testprint)
 
 def run():
     app = QtGui.QApplication(sys.argv)
     translator = QtCore.QTranslator()
 
-    translator.load("translations/bitmessage_" + str(locale.getlocale()[0]))
+    try:
-    #translator.load("translations/bitmessage_fr_BE") # Try French instead
+        translator.load("translations/bitmessage_" + str(locale.getlocale()[0]))
+    except:
+        # The above is not compatible with all versions of OSX.
+        translator.load("translations/bitmessage_en_US") # Default to english.
 
     QtGui.QApplication.installTranslator(translator)
     app.setStyleSheet("QStatusBar::item { border: 0px solid black }")
@@ -2938,5 +3042,8 @@ def run():
     myapp.appIndicatorInit(app)
     myapp.ubuntuMessagingMenuInit()
     myapp.notifierInit()
-
+    if gevent is None:
-    sys.exit(app.exec_())
+        sys.exit(app.exec_())
+    else:
+        gevent.joinall([gevent.spawn(testprint), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app)])
+        print 'done'

src/bitmessageqt/bitmessage_icons.qrc

@@ -1,20 +1,20 @@
 <RCC>
   <qresource prefix="newPrefix">
-    <file>images/can-icon-24px-yellow.png</file>
+    <file>../images/can-icon-24px-yellow.png</file>
-    <file>images/can-icon-24px-red.png</file>
+    <file>../images/can-icon-24px-red.png</file>
-    <file>images/can-icon-24px-green.png</file>
+    <file>../images/can-icon-24px-green.png</file>
-    <file>images/can-icon-24px.png</file>
+    <file>../images/can-icon-24px.png</file>
-    <file>images/can-icon-16px.png</file>
+    <file>../images/can-icon-16px.png</file>
-    <file>images/greenicon.png</file>
+    <file>../images/greenicon.png</file>
-    <file>images/redicon.png</file>
+    <file>../images/redicon.png</file>
-    <file>images/yellowicon.png</file>
+    <file>../images/yellowicon.png</file>
-    <file>images/addressbook.png</file>
+    <file>../images/addressbook.png</file>
-    <file>images/blacklist.png</file>
+    <file>../images/blacklist.png</file>
-    <file>images/identities.png</file>
+    <file>../images/identities.png</file>
-    <file>images/networkstatus.png</file>
+    <file>../images/networkstatus.png</file>
-    <file>images/sent.png</file>
+    <file>../images/sent.png</file>
-    <file>images/subscriptions.png</file>
+    <file>../images/subscriptions.png</file>
-    <file>images/send.png</file>
+    <file>../images/send.png</file>
-    <file>images/inbox.png</file>
+    <file>../images/inbox.png</file>
   </qresource>
 </RCC>

src/bitmessageqt/bitmessageui.py

@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'bitmessageui.ui'
 #
-# Created: Thu Jun 13 01:02:50 2013
+# Created: Sat Jul 13 20:23:44 2013
-#      by: PyQt4 UI code generator 4.10.1
+#      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -54,6 +54,21 @@ class Ui_MainWindow(object):
         self.inbox.setObjectName(_fromUtf8("inbox"))
         self.verticalLayout_2 = QtGui.QVBoxLayout(self.inbox)
         self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
+        self.horizontalLayoutSearch = QtGui.QHBoxLayout()
+        self.horizontalLayoutSearch.setContentsMargins(-1, 0, -1, -1)
+        self.horizontalLayoutSearch.setObjectName(_fromUtf8("horizontalLayoutSearch"))
+        self.inboxSearchLineEdit = QtGui.QLineEdit(self.inbox)
+        self.inboxSearchLineEdit.setObjectName(_fromUtf8("inboxSearchLineEdit"))
+        self.horizontalLayoutSearch.addWidget(self.inboxSearchLineEdit)
+        self.inboxSearchOptionCB = QtGui.QComboBox(self.inbox)
+        self.inboxSearchOptionCB.setObjectName(_fromUtf8("inboxSearchOptionCB"))
+        self.inboxSearchOptionCB.addItem(_fromUtf8(""))
+        self.inboxSearchOptionCB.addItem(_fromUtf8(""))
+        self.inboxSearchOptionCB.addItem(_fromUtf8(""))
+        self.inboxSearchOptionCB.addItem(_fromUtf8(""))
+        self.inboxSearchOptionCB.addItem(_fromUtf8(""))
+        self.horizontalLayoutSearch.addWidget(self.inboxSearchOptionCB)
+        self.verticalLayout_2.addLayout(self.horizontalLayoutSearch)
         self.tableWidgetInbox = QtGui.QTableWidget(self.inbox)
         self.tableWidgetInbox.setAlternatingRowColors(True)
         self.tableWidgetInbox.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
@@ -157,6 +172,21 @@ class Ui_MainWindow(object):
         self.sent.setObjectName(_fromUtf8("sent"))
         self.verticalLayout = QtGui.QVBoxLayout(self.sent)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setContentsMargins(-1, 0, -1, -1)
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.sentSearchLineEdit = QtGui.QLineEdit(self.sent)
+        self.sentSearchLineEdit.setObjectName(_fromUtf8("sentSearchLineEdit"))
+        self.horizontalLayout.addWidget(self.sentSearchLineEdit)
+        self.sentSearchOptionCB = QtGui.QComboBox(self.sent)
+        self.sentSearchOptionCB.setObjectName(_fromUtf8("sentSearchOptionCB"))
+        self.sentSearchOptionCB.addItem(_fromUtf8(""))
+        self.sentSearchOptionCB.addItem(_fromUtf8(""))
+        self.sentSearchOptionCB.addItem(_fromUtf8(""))
+        self.sentSearchOptionCB.addItem(_fromUtf8(""))
+        self.sentSearchOptionCB.addItem(_fromUtf8(""))
+        self.horizontalLayout.addWidget(self.sentSearchOptionCB)
+        self.verticalLayout.addLayout(self.horizontalLayout)
         self.tableWidgetSent = QtGui.QTableWidget(self.sent)
         self.tableWidgetSent.setDragDropMode(QtGui.QAbstractItemView.DragDrop)
         self.tableWidgetSent.setAlternatingRowColors(True)
@@ -467,6 +497,12 @@ class Ui_MainWindow(object):
 
     def retranslateUi(self, MainWindow):
         MainWindow.setWindowTitle(_translate("MainWindow", "Bitmessage", None))
+        self.inboxSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
+        self.inboxSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
+        self.inboxSearchOptionCB.setItemText(1, _translate("MainWindow", "To", None))
+        self.inboxSearchOptionCB.setItemText(2, _translate("MainWindow", "From", None))
+        self.inboxSearchOptionCB.setItemText(3, _translate("MainWindow", "Subject", None))
+        self.inboxSearchOptionCB.setItemText(4, _translate("MainWindow", "Message", None))
         self.tableWidgetInbox.setSortingEnabled(True)
         item = self.tableWidgetInbox.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "To", None))
@@ -492,6 +528,12 @@ class Ui_MainWindow(object):
         self.pushButtonSend.setText(_translate("MainWindow", "Send", None))
         self.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
+        self.sentSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
+        self.sentSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
+        self.sentSearchOptionCB.setItemText(1, _translate("MainWindow", "To", None))
+        self.sentSearchOptionCB.setItemText(2, _translate("MainWindow", "From", None))
+        self.sentSearchOptionCB.setItemText(3, _translate("MainWindow", "Subject", None))
+        self.sentSearchOptionCB.setItemText(4, _translate("MainWindow", "Message", None))
         self.tableWidgetSent.setSortingEnabled(True)
         item = self.tableWidgetSent.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "To", None))
@@ -537,9 +579,9 @@ class Ui_MainWindow(object):
         item.setText(_translate("MainWindow", "Address", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.blackwhitelist), _translate("MainWindow", "Blacklist", None))
         item = self.tableWidgetConnectionCount.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Stream Number", None))
+        item.setText(_translate("MainWindow", "Stream #", None))
         item = self.tableWidgetConnectionCount.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Number of Connections", None))
+        item.setText(_translate("MainWindow", "Connections", None))
         self.labelTotalConnections.setText(_translate("MainWindow", "Total connections: 0", None))
         self.labelStartupTime.setText(_translate("MainWindow", "Since startup at asdf:", None))
         self.labelMessageCount.setText(_translate("MainWindow", "Processed 0 person-to-person message.", None))
@@ -559,13 +601,3 @@ class Ui_MainWindow(object):
         self.actionDeleteAllTrashedMessages.setText(_translate("MainWindow", "Delete all trashed messages", None))
 
 import bitmessage_icons_rc
-
-if __name__ == "__main__":
-    import sys
-    app = QtGui.QApplication(sys.argv)
-    MainWindow = QtGui.QMainWindow()
-    ui = Ui_MainWindow()
-    ui.setupUi(MainWindow)
-    MainWindow.show()
-    sys.exit(app.exec_())
-

src/bitmessageqt/bitmessageui.ui

@@ -14,7 +14,7 @@
    <string>Bitmessage</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="bitmessage_icons.qrc">
+   <iconset>
     <normaloff>:/newPrefix/images/can-icon-24px.png</normaloff>:/newPrefix/images/can-icon-24px.png</iconset>
   </property>
   <property name="tabShape">
@@ -61,13 +61,56 @@
       </property>
       <widget class="QWidget" name="inbox">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/inbox.png</normaloff>:/newPrefix/images/inbox.png</iconset>
        </attribute>
        <attribute name="title">
         <string>Inbox</string>
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayoutSearch">
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QLineEdit" name="inboxSearchLineEdit">
+            <property name="placeholderText">
+             <string>Search</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="inboxSearchOptionCB">
+            <item>
+             <property name="text">
+              <string>All</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>To</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>From</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Subject</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Message</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </item>
         <item>
          <widget class="QTableWidget" name="tableWidgetInbox">
           <property name="alternatingRowColors">
@@ -145,7 +188,7 @@
       </widget>
       <widget class="QWidget" name="send">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/send.png</normaloff>:/newPrefix/images/send.png</iconset>
        </attribute>
        <attribute name="title">
@@ -303,13 +346,56 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="sent">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/sent.png</normaloff>:/newPrefix/images/sent.png</iconset>
        </attribute>
        <attribute name="title">
         <string>Sent</string>
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QLineEdit" name="sentSearchLineEdit">
+            <property name="placeholderText">
+             <string>Search</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="sentSearchOptionCB">
+            <item>
+             <property name="text">
+              <string>All</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>To</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>From</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Subject</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Message</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </item>
         <item>
          <widget class="QTableWidget" name="tableWidgetSent">
           <property name="dragDropMode">
@@ -380,7 +466,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="youridentities">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/identities.png</normaloff>:/newPrefix/images/identities.png</iconset>
        </attribute>
        <attribute name="title">
@@ -480,7 +566,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="subscriptions">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/subscriptions.png</normaloff>:/newPrefix/images/subscriptions.png</iconset>
        </attribute>
        <attribute name="title">
@@ -565,7 +651,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="addressbook">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/addressbook.png</normaloff>:/newPrefix/images/addressbook.png</iconset>
        </attribute>
        <attribute name="title">
@@ -647,7 +733,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="blackwhitelist">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/blacklist.png</normaloff>:/newPrefix/images/blacklist.png</iconset>
        </attribute>
        <attribute name="title">
@@ -739,7 +825,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="networkstatus">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/networkstatus.png</normaloff>:/newPrefix/images/networkstatus.png</iconset>
        </attribute>
        <attribute name="title">
@@ -758,7 +844,7 @@ p, li { white-space: pre-wrap; }
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="bitmessage_icons.qrc">
+         <iconset>
           <normaloff>:/newPrefix/images/redicon.png</normaloff>:/newPrefix/images/redicon.png</iconset>
         </property>
         <property name="flat">
@@ -840,12 +926,12 @@ p, li { white-space: pre-wrap; }
         </attribute>
         <column>
          <property name="text">
-          <string>Stream Number</string>
+          <string>Stream #</string>
          </property>
         </column>
         <column>
          <property name="text">
-          <string>Number of Connections</string>
+          <string>Connections</string>
          </property>
         </column>
        </widget>

src/bitmessageqt/newchandialog.py

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'newchandialog.ui'
+#
+# Created: Tue Jun 25 17:03:01 2013
+#      by: PyQt4 UI code generator 4.10.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_NewChanDialog(object):
+    def setupUi(self, NewChanDialog):
+        NewChanDialog.setObjectName(_fromUtf8("NewChanDialog"))
+        NewChanDialog.resize(447, 441)
+        self.formLayout = QtGui.QFormLayout(NewChanDialog)
+        self.formLayout.setObjectName(_fromUtf8("formLayout"))
+        self.radioButtonCreateChan = QtGui.QRadioButton(NewChanDialog)
+        self.radioButtonCreateChan.setObjectName(_fromUtf8("radioButtonCreateChan"))
+        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.radioButtonCreateChan)
+        self.radioButtonJoinChan = QtGui.QRadioButton(NewChanDialog)
+        self.radioButtonJoinChan.setChecked(True)
+        self.radioButtonJoinChan.setObjectName(_fromUtf8("radioButtonJoinChan"))
+        self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.radioButtonJoinChan)
+        self.groupBoxJoinChan = QtGui.QGroupBox(NewChanDialog)
+        self.groupBoxJoinChan.setObjectName(_fromUtf8("groupBoxJoinChan"))
+        self.gridLayout_2 = QtGui.QGridLayout(self.groupBoxJoinChan)
+        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.label = QtGui.QLabel(self.groupBoxJoinChan)
+        self.label.setWordWrap(True)
+        self.label.setObjectName(_fromUtf8("label"))
+        self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1)
+        self.label_2 = QtGui.QLabel(self.groupBoxJoinChan)
+        self.label_2.setObjectName(_fromUtf8("label_2"))
+        self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1)
+        self.lineEditChanNameJoin = QtGui.QLineEdit(self.groupBoxJoinChan)
+        self.lineEditChanNameJoin.setObjectName(_fromUtf8("lineEditChanNameJoin"))
+        self.gridLayout_2.addWidget(self.lineEditChanNameJoin, 2, 0, 1, 1)
+        self.label_3 = QtGui.QLabel(self.groupBoxJoinChan)
+        self.label_3.setObjectName(_fromUtf8("label_3"))
+        self.gridLayout_2.addWidget(self.label_3, 3, 0, 1, 1)
+        self.lineEditChanBitmessageAddress = QtGui.QLineEdit(self.groupBoxJoinChan)
+        self.lineEditChanBitmessageAddress.setObjectName(_fromUtf8("lineEditChanBitmessageAddress"))
+        self.gridLayout_2.addWidget(self.lineEditChanBitmessageAddress, 4, 0, 1, 1)
+        self.formLayout.setWidget(3, QtGui.QFormLayout.SpanningRole, self.groupBoxJoinChan)
+        self.groupBoxCreateChan = QtGui.QGroupBox(NewChanDialog)
+        self.groupBoxCreateChan.setObjectName(_fromUtf8("groupBoxCreateChan"))
+        self.gridLayout = QtGui.QGridLayout(self.groupBoxCreateChan)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.label_4 = QtGui.QLabel(self.groupBoxCreateChan)
+        self.label_4.setWordWrap(True)
+        self.label_4.setObjectName(_fromUtf8("label_4"))
+        self.gridLayout.addWidget(self.label_4, 0, 0, 1, 1)
+        self.label_5 = QtGui.QLabel(self.groupBoxCreateChan)
+        self.label_5.setObjectName(_fromUtf8("label_5"))
+        self.gridLayout.addWidget(self.label_5, 1, 0, 1, 1)
+        self.lineEditChanNameCreate = QtGui.QLineEdit(self.groupBoxCreateChan)
+        self.lineEditChanNameCreate.setObjectName(_fromUtf8("lineEditChanNameCreate"))
+        self.gridLayout.addWidget(self.lineEditChanNameCreate, 2, 0, 1, 1)
+        self.formLayout.setWidget(2, QtGui.QFormLayout.SpanningRole, self.groupBoxCreateChan)
+        self.buttonBox = QtGui.QDialogButtonBox(NewChanDialog)
+        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
+        self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
+        self.formLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.buttonBox)
+
+        self.retranslateUi(NewChanDialog)
+        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), NewChanDialog.accept)
+        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), NewChanDialog.reject)
+        QtCore.QObject.connect(self.radioButtonJoinChan, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBoxJoinChan.setShown)
+        QtCore.QObject.connect(self.radioButtonCreateChan, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBoxCreateChan.setShown)
+        QtCore.QMetaObject.connectSlotsByName(NewChanDialog)
+
+    def retranslateUi(self, NewChanDialog):
+        NewChanDialog.setWindowTitle(_translate("NewChanDialog", "Dialog", None))
+        self.radioButtonCreateChan.setText(_translate("NewChanDialog", "Create a new chan", None))
+        self.radioButtonJoinChan.setText(_translate("NewChanDialog", "Join a chan", None))
+        self.groupBoxJoinChan.setTitle(_translate("NewChanDialog", "Join a chan", None))
+        self.label.setText(_translate("NewChanDialog", "<html><head/><body><p>A chan is a set of encryption keys that is shared by a group of people. The keys and bitmessage address used by a chan is generated from a human-friendly word or phrase (the chan name).</p><p>Chans are experimental and are unmoderatable.</p></body></html>", None))
+        self.label_2.setText(_translate("NewChanDialog", "Chan name:", None))
+        self.label_3.setText(_translate("NewChanDialog", "Chan bitmessage address:", None))
+        self.groupBoxCreateChan.setTitle(_translate("NewChanDialog", "Create a chan", None))
+        self.label_4.setText(_translate("NewChanDialog", "Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private.", None))
+        self.label_5.setText(_translate("NewChanDialog", "Chan name:", None))
+

src/bitmessageqt/newchandialog.ui

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewChanDialog</class>
+ <widget class="QDialog" name="NewChanDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>447</width>
+    <height>441</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <item row="0" column="0">
+    <widget class="QRadioButton" name="radioButtonCreateChan">
+     <property name="text">
+      <string>Create a new chan</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QRadioButton" name="radioButtonJoinChan">
+     <property name="text">
+      <string>Join a chan</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBoxJoinChan">
+     <property name="title">
+      <string>Join a chan</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A chan is a set of encryption keys that is shared by a group of people. The keys and bitmessage address used by a chan is generated from a human-friendly word or phrase (the chan name).&lt;/p&gt;&lt;p&gt;Chans are experimental and are unmoderatable.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Chan name:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLineEdit" name="lineEditChanNameJoin"/>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Chan bitmessage address:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLineEdit" name="lineEditChanBitmessageAddress"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBoxCreateChan">
+     <property name="title">
+      <string>Create a chan</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Chan name:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLineEdit" name="lineEditChanNameCreate"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>NewChanDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>428</x>
+     <y>454</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>NewChanDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>430</x>
+     <y>460</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioButtonJoinChan</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>groupBoxJoinChan</receiver>
+   <slot>setShown(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>74</x>
+     <y>49</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>96</x>
+     <y>227</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioButtonCreateChan</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>groupBoxCreateChan</receiver>
+   <slot>setShown(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>72</x>
+     <y>28</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>65</x>
+     <y>92</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/build_osx.py

@@ -9,12 +9,12 @@ Usage (Windows):
 """
 
 import sys, os, shutil, re
-from setuptools import setup
+from setuptools import setup  # @UnresolvedImport
 
 
 name = "Bitmessage"
 mainscript = 'bitmessagemain.py'
-version = "0.3.3"
+version = "0.3.4"
 
 if sys.platform == 'darwin':
     extra_options = dict(

src/class_addressGenerator.py

@@ -0,0 +1,293 @@
+import shared
+import threading
+import time
+import sys
+from pyelliptic.openssl import OpenSSL
+import ctypes
+import hashlib
+import highlevelcrypto
+from addresses import *
+from pyelliptic import arithmetic
+import tr
+
+class addressGenerator(threading.Thread):
+
+    def __init__(self):
+        # QThread.__init__(self, parent)
+        threading.Thread.__init__(self)
+
+    def run(self):
+        while True:
+            queueValue = shared.addressGeneratorQueue.get()
+            nonceTrialsPerByte = 0
+            payloadLengthExtraBytes = 0
+            if queueValue[0] == 'createChan':
+                command, addressVersionNumber, streamNumber, label, deterministicPassphrase = queueValue
+                eighteenByteRipe = False
+                numberOfAddressesToMake = 1
+            elif queueValue[0] == 'joinChan':
+                command, chanAddress, label, deterministicPassphrase = queueValue
+                eighteenByteRipe = False
+                numberOfAddressesToMake = 1
+            elif len(queueValue) == 7:
+                command, addressVersionNumber, streamNumber, label, numberOfAddressesToMake, deterministicPassphrase, eighteenByteRipe = queueValue
+            elif len(queueValue) == 9:
+                command, addressVersionNumber, streamNumber, label, numberOfAddressesToMake, deterministicPassphrase, eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes = queueValue
+            else:
+                sys.stderr.write(
+                    'Programming error: A structure with the wrong number of values was passed into the addressGeneratorQueue. Here is the queueValue: %s\n' % queueValue)
+            if addressVersionNumber < 3 or addressVersionNumber > 3:
+                sys.stderr.write(
+                    'Program error: For some reason the address generator queue has been given a request to create at least one version %s address which it cannot do.\n' % addressVersionNumber)
+            if nonceTrialsPerByte == 0:
+                nonceTrialsPerByte = shared.config.getint(
+                    'bitmessagesettings', 'defaultnoncetrialsperbyte')
+            if nonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte:
+                nonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
+            if payloadLengthExtraBytes == 0:
+                payloadLengthExtraBytes = shared.config.getint(
+                    'bitmessagesettings', 'defaultpayloadlengthextrabytes')
+            if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes:
+                payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
+            if addressVersionNumber == 3:  # currently the only one supported.
+                if command == 'createRandomAddress':
+                    shared.UISignalQueue.put((
+                        'updateStatusBar', tr.translateText("MainWindow", "Generating one new address")))
+                    # This next section is a little bit strange. We're going to generate keys over and over until we
+                    # find one that starts with either \x00 or \x00\x00. Then when we pack them into a Bitmessage address,
+                    # we won't store the \x00 or \x00\x00 bytes thus making the
+                    # address shorter.
+                    startTime = time.time()
+                    numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix = 0
+                    potentialPrivSigningKey = OpenSSL.rand(32)
+                    potentialPubSigningKey = pointMult(potentialPrivSigningKey)
+                    while True:
+                        numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix += 1
+                        potentialPrivEncryptionKey = OpenSSL.rand(32)
+                        potentialPubEncryptionKey = pointMult(
+                            potentialPrivEncryptionKey)
+                        # print 'potentialPubSigningKey', potentialPubSigningKey.encode('hex')
+                        # print 'potentialPubEncryptionKey',
+                        # potentialPubEncryptionKey.encode('hex')
+                        ripe = hashlib.new('ripemd160')
+                        sha = hashlib.new('sha512')
+                        sha.update(
+                            potentialPubSigningKey + potentialPubEncryptionKey)
+                        ripe.update(sha.digest())
+                        # print 'potential ripe.digest',
+                        # ripe.digest().encode('hex')
+                        if eighteenByteRipe:
+                            if ripe.digest()[:2] == '\x00\x00':
+                                break
+                        else:
+                            if ripe.digest()[:1] == '\x00':
+                                break
+                    print 'Generated address with ripe digest:', ripe.digest().encode('hex')
+                    print 'Address generator calculated', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix, 'addresses at', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix / (time.time() - startTime), 'addresses per second before finding one with the correct ripe-prefix.'
+                    address = encodeAddress(3, streamNumber, ripe.digest())
+
+                    # An excellent way for us to store our keys is in Wallet Import Format. Let us convert now.
+                    # https://en.bitcoin.it/wiki/Wallet_import_format
+                    privSigningKey = '\x80' + potentialPrivSigningKey
+                    checksum = hashlib.sha256(hashlib.sha256(
+                        privSigningKey).digest()).digest()[0:4]
+                    privSigningKeyWIF = arithmetic.changebase(
+                        privSigningKey + checksum, 256, 58)
+                    # print 'privSigningKeyWIF',privSigningKeyWIF
+
+                    privEncryptionKey = '\x80' + potentialPrivEncryptionKey
+                    checksum = hashlib.sha256(hashlib.sha256(
+                        privEncryptionKey).digest()).digest()[0:4]
+                    privEncryptionKeyWIF = arithmetic.changebase(
+                        privEncryptionKey + checksum, 256, 58)
+                    # print 'privEncryptionKeyWIF',privEncryptionKeyWIF
+
+                    shared.config.add_section(address)
+                    shared.config.set(address, 'label', label)
+                    shared.config.set(address, 'enabled', 'true')
+                    shared.config.set(address, 'decoy', 'false')
+                    shared.config.set(address, 'noncetrialsperbyte', str(
+                        nonceTrialsPerByte))
+                    shared.config.set(address, 'payloadlengthextrabytes', str(
+                        payloadLengthExtraBytes))
+                    shared.config.set(
+                        address, 'privSigningKey', privSigningKeyWIF)
+                    shared.config.set(
+                        address, 'privEncryptionKey', privEncryptionKeyWIF)
+                    with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                        shared.config.write(configfile)
+
+                    # It may be the case that this address is being generated
+                    # as a result of a call to the API. Let us put the result
+                    # in the necessary queue.
+                    shared.apiAddressGeneratorReturnQueue.put(address)
+
+                    shared.UISignalQueue.put((
+                        'updateStatusBar', tr.translateText("MainWindow", "Done generating address. Doing work necessary to broadcast it...")))
+                    shared.UISignalQueue.put(('writeNewAddressToTable', (
+                        label, address, streamNumber)))
+                    shared.reloadMyAddressHashes()
+                    shared.workerQueue.put((
+                        'doPOWForMyV3Pubkey', ripe.digest()))
+
+                elif command == 'createDeterministicAddresses' or command == 'getDeterministicAddress' or command == 'createChan' or command == 'joinChan':
+                    if len(deterministicPassphrase) == 0:
+                        sys.stderr.write(
+                            'WARNING: You are creating deterministic address(es) using a blank passphrase. Bitmessage will do it but it is rather stupid.')
+                    if command == 'createDeterministicAddresses':
+                        statusbar = 'Generating ' + str(
+                            numberOfAddressesToMake) + ' new addresses.'
+                        shared.UISignalQueue.put((
+                            'updateStatusBar', statusbar))
+                    signingKeyNonce = 0
+                    encryptionKeyNonce = 1
+                    listOfNewAddressesToSendOutThroughTheAPI = [
+                    ]  # We fill out this list no matter what although we only need it if we end up passing the info to the API.
+
+                    for i in range(numberOfAddressesToMake):
+                        # This next section is a little bit strange. We're going to generate keys over and over until we
+                        # find one that has a RIPEMD hash that starts with either \x00 or \x00\x00. Then when we pack them
+                        # into a Bitmessage address, we won't store the \x00 or
+                        # \x00\x00 bytes thus making the address shorter.
+                        startTime = time.time()
+                        numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix = 0
+                        while True:
+                            numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix += 1
+                            potentialPrivSigningKey = hashlib.sha512(
+                                deterministicPassphrase + encodeVarint(signingKeyNonce)).digest()[:32]
+                            potentialPrivEncryptionKey = hashlib.sha512(
+                                deterministicPassphrase + encodeVarint(encryptionKeyNonce)).digest()[:32]
+                            potentialPubSigningKey = pointMult(
+                                potentialPrivSigningKey)
+                            potentialPubEncryptionKey = pointMult(
+                                potentialPrivEncryptionKey)
+                            # print 'potentialPubSigningKey', potentialPubSigningKey.encode('hex')
+                            # print 'potentialPubEncryptionKey',
+                            # potentialPubEncryptionKey.encode('hex')
+                            signingKeyNonce += 2
+                            encryptionKeyNonce += 2
+                            ripe = hashlib.new('ripemd160')
+                            sha = hashlib.new('sha512')
+                            sha.update(
+                                potentialPubSigningKey + potentialPubEncryptionKey)
+                            ripe.update(sha.digest())
+                            # print 'potential ripe.digest',
+                            # ripe.digest().encode('hex')
+                            if eighteenByteRipe:
+                                if ripe.digest()[:2] == '\x00\x00':
+                                    break
+                            else:
+                                if ripe.digest()[:1] == '\x00':
+                                    break
+
+                        print 'ripe.digest', ripe.digest().encode('hex')
+                        print 'Address generator calculated', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix, 'addresses at', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix / (time.time() - startTime), 'keys per second.'
+                        address = encodeAddress(3, streamNumber, ripe.digest())
+
+                        saveAddressToDisk = True
+                        # If we are joining an existing chan, let us check to make sure it matches the provided Bitmessage address
+                        if command == 'joinChan':
+                            if address != chanAddress:
+                                #todo: show an error message in the UI
+                                shared.apiAddressGeneratorReturnQueue.put('API Error 0018: Chan name does not match address.')
+                                saveAddressToDisk = False
+                        if command == 'getDeterministicAddress':
+                            saveAddressToDisk = False
+
+                        if saveAddressToDisk:
+                            # An excellent way for us to store our keys is in Wallet Import Format. Let us convert now.
+                            # https://en.bitcoin.it/wiki/Wallet_import_format
+                            privSigningKey = '\x80' + potentialPrivSigningKey
+                            checksum = hashlib.sha256(hashlib.sha256(
+                                privSigningKey).digest()).digest()[0:4]
+                            privSigningKeyWIF = arithmetic.changebase(
+                                privSigningKey + checksum, 256, 58)
+
+                            privEncryptionKey = '\x80' + \
+                                potentialPrivEncryptionKey
+                            checksum = hashlib.sha256(hashlib.sha256(
+                                privEncryptionKey).digest()).digest()[0:4]
+                            privEncryptionKeyWIF = arithmetic.changebase(
+                                privEncryptionKey + checksum, 256, 58)
+
+                            try:
+                                shared.config.add_section(address)
+                                print 'label:', label
+                                shared.config.set(address, 'label', label)
+                                shared.config.set(address, 'enabled', 'true')
+                                shared.config.set(address, 'decoy', 'false')
+                                if command == 'joinChan' or command == 'createChan':
+                                    shared.config.set(address, 'chan', 'true')
+                                shared.config.set(address, 'noncetrialsperbyte', str(
+                                    nonceTrialsPerByte))
+                                shared.config.set(address, 'payloadlengthextrabytes', str(
+                                    payloadLengthExtraBytes))
+                                shared.config.set(
+                                    address, 'privSigningKey', privSigningKeyWIF)
+                                shared.config.set(
+                                    address, 'privEncryptionKey', privEncryptionKeyWIF)
+                                with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                                    shared.config.write(configfile)
+
+                                shared.UISignalQueue.put(('writeNewAddressToTable', (
+                                    label, address, str(streamNumber))))
+                                listOfNewAddressesToSendOutThroughTheAPI.append(
+                                    address)
+                                shared.myECCryptorObjects[ripe.digest()] = highlevelcrypto.makeCryptor(
+                                    potentialPrivEncryptionKey.encode('hex'))
+                                shared.myAddressesByHash[
+                                    ripe.digest()] = address
+                                #todo: don't send out pubkey if dealing with a chan; save in pubkeys table instead.
+                                shared.workerQueue.put((
+                                    'doPOWForMyV3Pubkey', ripe.digest()))
+                            except:
+                                print address, 'already exists. Not adding it again.'
+
+                    # Done generating addresses.
+                    if command == 'createDeterministicAddresses':
+                        # It may be the case that this address is being
+                        # generated as a result of a call to the API. Let us
+                        # put the result in the necessary queue.
+                        shared.apiAddressGeneratorReturnQueue.put(
+                            listOfNewAddressesToSendOutThroughTheAPI)
+                        shared.UISignalQueue.put((
+                            'updateStatusBar', tr.translateText("MainWindow", "Done generating address")))
+                        # shared.reloadMyAddressHashes()
+                    elif command == 'getDeterministicAddress':
+                        shared.apiAddressGeneratorReturnQueue.put(address)
+                    #todo: return things to the API if createChan or joinChan assuming saveAddressToDisk
+                else:
+                    raise Exception(
+                        "Error in the addressGenerator thread. Thread was given a command it could not understand: " + command)
+
+
+# Does an EC point multiplication; turns a private key into a public key.
+
+
+def pointMult(secret):
+    # ctx = OpenSSL.BN_CTX_new() #This value proved to cause Seg Faults on
+    # Linux. It turns out that it really didn't speed up EC_POINT_mul anyway.
+    k = OpenSSL.EC_KEY_new_by_curve_name(OpenSSL.get_curve('secp256k1'))
+    priv_key = OpenSSL.BN_bin2bn(secret, 32, 0)
+    group = OpenSSL.EC_KEY_get0_group(k)
+    pub_key = OpenSSL.EC_POINT_new(group)
+
+    OpenSSL.EC_POINT_mul(group, pub_key, priv_key, None, None, None)
+    OpenSSL.EC_KEY_set_private_key(k, priv_key)
+    OpenSSL.EC_KEY_set_public_key(k, pub_key)
+    # print 'priv_key',priv_key
+    # print 'pub_key',pub_key
+
+    size = OpenSSL.i2o_ECPublicKey(k, 0)
+    mb = ctypes.create_string_buffer(size)
+    OpenSSL.i2o_ECPublicKey(k, ctypes.byref(ctypes.pointer(mb)))
+    # print 'mb.raw', mb.raw.encode('hex'), 'length:', len(mb.raw)
+    # print 'mb.raw', mb.raw, 'length:', len(mb.raw)
+
+    OpenSSL.EC_POINT_free(pub_key)
+    # OpenSSL.BN_CTX_free(ctx)
+    OpenSSL.BN_free(priv_key)
+    OpenSSL.EC_KEY_free(k)
+    return mb.raw
+    
+    

src/class_bgWorker.py

@@ -0,0 +1,38 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+# cody by linker.lin@me.com
+
+__author__ = 'linkerlin'
+
+
+import threading
+import Queue
+import time
+
+class bgWorker(threading.Thread):
+    def __init__(self):
+        threading.Thread.__init__(self)
+        self.q = Queue.Queue()
+        self.setDaemon(True)
+
+    def post(self,job):
+        self.q.put(job)
+
+    def run(self):
+        while 1:
+            job=None
+            try:
+                job = self.q.get(block=True)
+                if job:
+                    job()
+            except Exception as ex:
+                print "Error,job exception:",ex.message,type(ex)
+                time.sleep(0.05)
+            else:
+                #print "job: ", job, " done"
+                pass
+            finally:
+                time.sleep(0.05)
+
+bgworker = bgWorker()
+bgworker.start()

src/class_outgoingSynSender.py

@@ -0,0 +1,174 @@
+import threading
+import time
+import random
+import shared
+import socks
+import socket
+import sys
+import tr
+
+#import bitmessagemain
+from class_sendDataThread import *
+from class_receiveDataThread import *
+
+# For each stream to which we connect, several outgoingSynSender threads
+# will exist and will collectively create 8 connections with peers.
+
+class outgoingSynSender(threading.Thread):
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def setup(self, streamNumber, selfInitiatedConnections):
+        self.streamNumber = streamNumber
+        self.selfInitiatedConnections = selfInitiatedConnections
+
+    def run(self):
+        time.sleep(1)
+        while True:
+            while len(self.selfInitiatedConnections[self.streamNumber]) >= 8:  # maximum number of outgoing connections = 8
+                time.sleep(10)
+            if shared.shutdown:
+                break
+            random.seed()
+            shared.knownNodesLock.acquire()
+            HOST, = random.sample(shared.knownNodes[self.streamNumber], 1)
+            shared.knownNodesLock.release()
+            shared.alreadyAttemptedConnectionsListLock.acquire()
+            while HOST in shared.alreadyAttemptedConnectionsList or HOST in shared.connectedHostsList:
+                shared.alreadyAttemptedConnectionsListLock.release()
+                # print 'choosing new sample'
+                random.seed()
+                shared.knownNodesLock.acquire()
+                HOST, = random.sample(shared.knownNodes[self.streamNumber], 1)
+                shared.knownNodesLock.release()
+                time.sleep(1)
+                # Clear out the shared.alreadyAttemptedConnectionsList every half
+                # hour so that this program will again attempt a connection
+                # to any nodes, even ones it has already tried.
+                if (time.time() - shared.alreadyAttemptedConnectionsListResetTime) > 1800:
+                    shared.alreadyAttemptedConnectionsList.clear()
+                    shared.alreadyAttemptedConnectionsListResetTime = int(
+                        time.time())
+                shared.alreadyAttemptedConnectionsListLock.acquire()
+            shared.alreadyAttemptedConnectionsList[HOST] = 0
+            shared.alreadyAttemptedConnectionsListLock.release()
+            PORT, timeNodeLastSeen = shared.knownNodes[
+                self.streamNumber][HOST]
+            sock = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM)
+            # This option apparently avoids the TIME_WAIT state so that we
+            # can rebind faster
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.settimeout(20)
+            if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and shared.verbose >= 2:
+                with shared.printLock:
+                    print 'Trying an outgoing connection to', HOST, ':', PORT
+
+                # sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS4a':
+                if shared.verbose >= 2:
+                    with shared.printLock:
+                        print '(Using SOCKS4a) Trying an outgoing connection to', HOST, ':', PORT
+
+                proxytype = socks.PROXY_TYPE_SOCKS4
+                sockshostname = shared.config.get(
+                    'bitmessagesettings', 'sockshostname')
+                socksport = shared.config.getint(
+                    'bitmessagesettings', 'socksport')
+                rdns = True  # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway.
+                if shared.config.getboolean('bitmessagesettings', 'socksauthentication'):
+                    socksusername = shared.config.get(
+                        'bitmessagesettings', 'socksusername')
+                    sockspassword = shared.config.get(
+                        'bitmessagesettings', 'sockspassword')
+                    sock.setproxy(
+                        proxytype, sockshostname, socksport, rdns, socksusername, sockspassword)
+                else:
+                    sock.setproxy(
+                        proxytype, sockshostname, socksport, rdns)
+            elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS5':
+                if shared.verbose >= 2:
+                    with shared.printLock:
+                        print '(Using SOCKS5) Trying an outgoing connection to', HOST, ':', PORT
+
+                proxytype = socks.PROXY_TYPE_SOCKS5
+                sockshostname = shared.config.get(
+                    'bitmessagesettings', 'sockshostname')
+                socksport = shared.config.getint(
+                    'bitmessagesettings', 'socksport')
+                rdns = True  # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway.
+                if shared.config.getboolean('bitmessagesettings', 'socksauthentication'):
+                    socksusername = shared.config.get(
+                        'bitmessagesettings', 'socksusername')
+                    sockspassword = shared.config.get(
+                        'bitmessagesettings', 'sockspassword')
+                    sock.setproxy(
+                        proxytype, sockshostname, socksport, rdns, socksusername, sockspassword)
+                else:
+                    sock.setproxy(
+                        proxytype, sockshostname, socksport, rdns)
+
+            try:
+                sock.connect((HOST, PORT))
+                rd = receiveDataThread()
+                rd.daemon = True  # close the main program even if there are threads left
+                someObjectsOfWhichThisRemoteNodeIsAlreadyAware = {} # This is not necessairly a complete list; we clear it from time to time to save memory.
+                rd.setup(sock, HOST, PORT, self.streamNumber,
+                         someObjectsOfWhichThisRemoteNodeIsAlreadyAware, self.selfInitiatedConnections)
+                rd.start()
+                with shared.printLock:
+                    print self, 'connected to', HOST, 'during an outgoing attempt.'
+
+
+                sd = sendDataThread()
+                sd.setup(sock, HOST, PORT, self.streamNumber,
+                         someObjectsOfWhichThisRemoteNodeIsAlreadyAware)
+                sd.start()
+                sd.sendVersionMessage()
+
+            except socks.GeneralProxyError as err:
+                if shared.verbose >= 2:
+                    with shared.printLock:
+                        print 'Could NOT connect to', HOST, 'during outgoing attempt.', err
+
+                PORT, timeLastSeen = shared.knownNodes[
+                    self.streamNumber][HOST]
+                if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000:  # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the shared.knownNodes data-structure.
+                    shared.knownNodesLock.acquire()
+                    del shared.knownNodes[self.streamNumber][HOST]
+                    shared.knownNodesLock.release()
+                    with shared.printLock:
+                        print 'deleting ', HOST, 'from shared.knownNodes because it is more than 48 hours old and we could not connect to it.'
+
+            except socks.Socks5AuthError as err:
+                shared.UISignalQueue.put((
+                    'updateStatusBar', tr.translateText(
+                    "MainWindow", "SOCKS5 Authentication problem: %1").arg(str(err))))
+            except socks.Socks5Error as err:
+                pass
+                print 'SOCKS5 error. (It is possible that the server wants authentication).)', str(err)
+            except socks.Socks4Error as err:
+                print 'Socks4Error:', err
+            except socket.error as err:
+                if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS':
+                    print 'Bitmessage MIGHT be having trouble connecting to the SOCKS server. ' + str(err)
+                else:
+                    if shared.verbose >= 1:
+                        with shared.printLock:
+                            print 'Could NOT connect to', HOST, 'during outgoing attempt.', err
+
+                    PORT, timeLastSeen = shared.knownNodes[
+                        self.streamNumber][HOST]
+                    if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000:  # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the knownNodes data-structure.
+                        shared.knownNodesLock.acquire()
+                        del shared.knownNodes[self.streamNumber][HOST]
+                        shared.knownNodesLock.release()
+                        with shared.printLock:
+                            print 'deleting ', HOST, 'from knownNodes because it is more than 48 hours old and we could not connect to it.'
+
+            except Exception as err:
+                sys.stderr.write(
+                    'An exception has occurred in the outgoingSynSender thread that was not caught by other exception types: ')
+                import traceback
+                traceback.print_exc()
+            time.sleep(0.1)

src/class_receiveDataThread.py

@@ -0,0 +1,2044 @@
+doTimingAttackMitigation = True
+
+import time
+import threading
+import shared
+import hashlib
+import socket
+import pickle
+import random
+from struct import unpack, pack
+import sys
+import string
+from subprocess import call  # used when the API must execute an outside program
+from pyelliptic.openssl import OpenSSL
+
+import highlevelcrypto
+from addresses import *
+import helper_generic
+import helper_bitcoin
+import helper_inbox
+import helper_sent
+import tr
+#from bitmessagemain import shared.lengthOfTimeToLeaveObjectsInInventory, shared.lengthOfTimeToHoldOnToAllPubkeys, shared.maximumAgeOfAnObjectThatIAmWillingToAccept, shared.maximumAgeOfObjectsThatIAdvertiseToOthers, shared.maximumAgeOfNodesThatIAdvertiseToOthers, shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer, shared.neededPubkeys
+
+# This thread is created either by the synSenderThread(for outgoing
+# connections) or the singleListenerThread(for incoming connectiosn).
+
+class receiveDataThread(threading.Thread):
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+        self.data = ''
+        self.verackSent = False
+        self.verackReceived = False
+
+    def setup(
+        self,
+        sock,
+        HOST,
+        port,
+        streamNumber,
+            someObjectsOfWhichThisRemoteNodeIsAlreadyAware,
+            selfInitiatedConnections):
+        self.sock = sock
+        self.HOST = HOST
+        self.PORT = port
+        self.streamNumber = streamNumber
+        self.payloadLength = 0  # This is the protocol payload length thus it doesn't include the 24 byte message header
+        self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = {}
+        self.selfInitiatedConnections = selfInitiatedConnections
+        shared.connectedHostsList[
+            self.HOST] = 0  # The very fact that this receiveData thread exists shows that we are connected to the remote host. Let's add it to this list so that an outgoingSynSender thread doesn't try to connect to it.
+        self.connectionIsOrWasFullyEstablished = False  # set to true after the remote node and I accept each other's version messages. This is needed to allow the user interface to accurately reflect the current number of connections.
+        if self.streamNumber == -1:  # This was an incoming connection. Send out a version message if we accept the other node's version message.
+            self.initiatedConnection = False
+        else:
+            self.initiatedConnection = True
+            self.selfInitiatedConnections[streamNumber][self] = 0
+        self.ackDataThatWeHaveYetToSend = [
+        ]  # When we receive a message bound for us, we store the acknowledgement that we need to send (the ackdata) here until we are done processing all other data received from this peer.
+        self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware = someObjectsOfWhichThisRemoteNodeIsAlreadyAware
+
+    def run(self):
+        with shared.printLock:
+            print 'ID of the receiveDataThread is', str(id(self)) + '. The size of the shared.connectedHostsList is now', len(shared.connectedHostsList)
+
+        while True:
+            dataLen = len(self.data)
+            try:
+                self.data += self.sock.recv(4096)
+            except socket.timeout:
+                with shared.printLock:
+                    print 'Timeout occurred waiting for data from', self.HOST + '. Closing receiveData thread. (ID:', str(id(self)) + ')'
+
+                break
+            except Exception as err:
+                with shared.printLock:
+                    print 'sock.recv error. Closing receiveData thread (HOST:', self.HOST, 'ID:', str(id(self)) + ').', err
+
+                break
+            # print 'Received', repr(self.data)
+            if len(self.data) == dataLen: # If self.sock.recv returned no data:
+                with shared.printLock:
+                    print 'Connection to', self.HOST, 'closed. Closing receiveData thread. (ID:', str(id(self)) + ')'
+                break
+            else:
+                self.processData()
+
+        try:
+            del self.selfInitiatedConnections[self.streamNumber][self]
+            with shared.printLock:
+                print 'removed self (a receiveDataThread) from selfInitiatedConnections'
+
+        except:
+            pass
+        shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
+        try:
+            del shared.connectedHostsList[self.HOST]
+        except Exception as err:
+            with shared.printLock:
+                print 'Could not delete', self.HOST, 'from shared.connectedHostsList.', err
+
+        try:
+            del shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[
+                self.HOST]
+        except:
+            pass
+        shared.UISignalQueue.put(('updateNetworkStatusTab', 'no data'))
+        with shared.printLock:
+            print 'The size of the connectedHostsList is now:', len(shared.connectedHostsList)
+
+
+    def processData(self):
+        # if shared.verbose >= 3:
+            # with shared.printLock:
+            #   print 'self.data is currently ', repr(self.data)
+            #
+        if len(self.data) < 20:  # if so little of the data has arrived that we can't even unpack the payload length
+            return
+        if self.data[0:4] != '\xe9\xbe\xb4\xd9':
+            if shared.verbose >= 1:
+                with shared.printLock:
+                    print 'The magic bytes were not correct. First 40 bytes of data: ' + repr(self.data[0:40])
+
+            self.data = ""
+            return
+        self.payloadLength, = unpack('>L', self.data[16:20])
+        if len(self.data) < self.payloadLength + 24:  # check if the whole message has arrived yet.
+            return
+        if self.data[20:24] != hashlib.sha512(self.data[24:self.payloadLength + 24]).digest()[0:4]:  # test the checksum in the message. If it is correct...
+            print 'Checksum incorrect. Clearing this message.'
+            self.data = self.data[self.payloadLength + 24:]
+            self.processData()
+            return
+        # The time we've last seen this node is obviously right now since we
+        # just received valid data from it. So update the knownNodes list so
+        # that other peers can be made aware of its existance.
+        if self.initiatedConnection and self.connectionIsOrWasFullyEstablished:  # The remote port is only something we should share with others if it is the remote node's incoming port (rather than some random operating-system-assigned outgoing port).
+            shared.knownNodesLock.acquire()
+            shared.knownNodes[self.streamNumber][
+                self.HOST] = (self.PORT, int(time.time()))
+            shared.knownNodesLock.release()
+        if self.payloadLength <= 180000000:  # If the size of the message is greater than 180MB, ignore it. (I get memory errors when processing messages much larger than this though it is concievable that this value will have to be lowered if some systems are less tolarant of large messages.)
+            remoteCommand = self.data[4:16]
+            with shared.printLock:
+                print 'remoteCommand', repr(remoteCommand.replace('\x00', '')), ' from', self.HOST
+
+            if remoteCommand == 'version\x00\x00\x00\x00\x00':
+                self.recversion(self.data[24:self.payloadLength + 24])
+            elif remoteCommand == 'verack\x00\x00\x00\x00\x00\x00':
+                self.recverack()
+            elif remoteCommand == 'addr\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                self.recaddr(self.data[24:self.payloadLength + 24])
+            elif remoteCommand == 'getpubkey\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                self.recgetpubkey(self.data[24:self.payloadLength + 24])
+            elif remoteCommand == 'pubkey\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                self.recpubkey(self.data[24:self.payloadLength + 24])
+            elif remoteCommand == 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                self.recinv(self.data[24:self.payloadLength + 24])
+            elif remoteCommand == 'getdata\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                self.recgetdata(self.data[24:self.payloadLength + 24])
+            elif remoteCommand == 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                self.recmsg(self.data[24:self.payloadLength + 24])
+            elif remoteCommand == 'broadcast\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                self.recbroadcast(self.data[24:self.payloadLength + 24])
+            elif remoteCommand == 'ping\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                self.sendpong()
+            elif remoteCommand == 'pong\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                pass
+            elif remoteCommand == 'alert\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
+                pass
+
+        self.data = self.data[
+            self.payloadLength + 24:]  # take this message out and then process the next message
+        if self.data == '':
+            while len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 0:
+                random.seed()
+                objectHash, = random.sample(
+                    self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 1)
+                if objectHash in shared.inventory:
+                    with shared.printLock:
+                        print 'Inventory (in memory) already has object listed in inv message.'
+
+                    del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[
+                        objectHash]
+                elif shared.isInSqlInventory(objectHash):
+                    if shared.verbose >= 3:
+                        with shared.printLock:
+                            print 'Inventory (SQL on disk) already has object listed in inv message.'
+
+                    del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[
+                        objectHash]
+                else:
+                    self.sendgetdata(objectHash)
+                    del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[
+                        objectHash]  # It is possible that the remote node doesn't respond with the object. In that case, we'll very likely get it from someone else anyway.
+                    if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) == 0:
+                        with shared.printLock:
+                            print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)
+
+                        try:
+                            del shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[
+                                self.HOST]  # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together.
+                        except:
+                            pass
+                    break
+                if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) == 0:
+                    with shared.printLock:
+                        print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)
+
+                    try:
+                        del shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[
+                            self.HOST]  # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together.
+                    except:
+                        pass
+            if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 0:
+                with shared.printLock:
+                    print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)
+
+                shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] = len(
+                    self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)  # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together.
+            if len(self.ackDataThatWeHaveYetToSend) > 0:
+                self.data = self.ackDataThatWeHaveYetToSend.pop()
+        self.processData()
+
+    def isProofOfWorkSufficient(
+        self,
+        data,
+        nonceTrialsPerByte=0,
+            payloadLengthExtraBytes=0):
+        if nonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte:
+            nonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
+        if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes:
+            payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
+        POW, = unpack('>Q', hashlib.sha512(hashlib.sha512(data[
+                      :8] + hashlib.sha512(data[8:]).digest()).digest()).digest()[0:8])
+        # print 'POW:', POW
+        return POW <= 2 ** 64 / ((len(data) + payloadLengthExtraBytes) * (nonceTrialsPerByte))
+
+    def sendpong(self):
+        print 'Sending pong'
+        try:
+            self.sock.sendall(
+                '\xE9\xBE\xB4\xD9\x70\x6F\x6E\x67\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35')
+        except Exception as err:
+            # if not 'Bad file descriptor' in err:
+            with shared.printLock:
+                print 'sock.sendall error:', err
+
+
+    def recverack(self):
+        print 'verack received'
+        self.verackReceived = True
+        if self.verackSent:
+            # We have thus both sent and received a verack.
+            self.connectionFullyEstablished()
+
+    def connectionFullyEstablished(self):
+        self.connectionIsOrWasFullyEstablished = True
+        if not self.initiatedConnection:
+            shared.UISignalQueue.put(('setStatusIcon', 'green'))
+        self.sock.settimeout(
+            600)  # We'll send out a pong every 5 minutes to make sure the connection stays alive if there has been no other traffic to send lately.
+        shared.UISignalQueue.put(('updateNetworkStatusTab', 'no data'))
+        remoteNodeIncomingPort, remoteNodeSeenTime = shared.knownNodes[
+            self.streamNumber][self.HOST]
+        with shared.printLock:
+            print 'Connection fully established with', self.HOST, remoteNodeIncomingPort
+            print 'The size of the connectedHostsList is now', len(shared.connectedHostsList)
+            print 'The length of sendDataQueues is now:', len(shared.sendDataQueues)
+            print 'broadcasting addr from within connectionFullyEstablished function.'
+
+        self.broadcastaddr([(int(time.time()), self.streamNumber, 1, self.HOST,
+                           remoteNodeIncomingPort)])  # This lets all of our peers know about this new node.
+        self.sendaddr()  # This is one large addr message to this one peer.
+        if not self.initiatedConnection and len(shared.connectedHostsList) > 200:
+            with shared.printLock:
+                print 'We are connected to too many people. Closing connection.'
+
+            shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
+            return
+        self.sendBigInv()
+
+    def sendBigInv(self):
+        shared.sqlLock.acquire()
+        # Select all hashes which are younger than two days old and in this
+        # stream.
+        t = (int(time.time()) - shared.maximumAgeOfObjectsThatIAdvertiseToOthers, int(
+            time.time()) - shared.lengthOfTimeToHoldOnToAllPubkeys, self.streamNumber)
+        shared.sqlSubmitQueue.put(
+            '''SELECT hash FROM inventory WHERE ((receivedtime>? and objecttype<>'pubkey') or (receivedtime>? and objecttype='pubkey')) and streamnumber=?''')
+        shared.sqlSubmitQueue.put(t)
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        bigInvList = {}
+        for row in queryreturn:
+            hash, = row
+            if hash not in self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware:
+                bigInvList[hash] = 0
+        # We also have messages in our inventory in memory (which is a python
+        # dictionary). Let's fetch those too.
+        for hash, storedValue in shared.inventory.items():
+            if hash not in self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware:
+                objectType, streamNumber, payload, receivedTime = storedValue
+                if streamNumber == self.streamNumber and receivedTime > int(time.time()) - shared.maximumAgeOfObjectsThatIAdvertiseToOthers:
+                    bigInvList[hash] = 0
+        numberOfObjectsInInvMessage = 0
+        payload = ''
+        # Now let us start appending all of these hashes together. They will be
+        # sent out in a big inv message to our new peer.
+        for hash, storedValue in bigInvList.items():
+            payload += hash
+            numberOfObjectsInInvMessage += 1
+            if numberOfObjectsInInvMessage >= 50000:  # We can only send a max of 50000 items per inv message but we may have more objects to advertise. They must be split up into multiple inv messages.
+                self.sendinvMessageToJustThisOnePeer(
+                    numberOfObjectsInInvMessage, payload)
+                payload = ''
+                numberOfObjectsInInvMessage = 0
+        if numberOfObjectsInInvMessage > 0:
+            self.sendinvMessageToJustThisOnePeer(
+                numberOfObjectsInInvMessage, payload)
+
+    # Self explanatory. Notice that there is also a broadcastinv function for
+    # broadcasting invs to everyone in our stream.
+    def sendinvMessageToJustThisOnePeer(self, numberOfObjects, payload):
+        payload = encodeVarint(numberOfObjects) + payload
+        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
+        headerData += 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+        headerData += pack('>L', len(payload))
+        headerData += hashlib.sha512(payload).digest()[:4]
+        with shared.printLock:
+            print 'Sending huge inv message with', numberOfObjects, 'objects to just this one peer'
+
+        try:
+            self.sock.sendall(headerData + payload)
+        except Exception as err:
+            # if not 'Bad file descriptor' in err:
+            with shared.printLock:
+                print 'sock.sendall error:', err
+
+
+    # We have received a broadcast message
+    def recbroadcast(self, data):
+        self.messageProcessingStartTime = time.time()
+        # First we must check to make sure the proof of work is sufficient.
+        if not self.isProofOfWorkSufficient(data):
+            print 'Proof of work in broadcast message insufficient.'
+            return
+        readPosition = 8  # bypass the nonce
+        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
+
+        # This section is used for the transition from 32 bit time to 64 bit
+        # time in the protocol.
+        if embeddedTime == 0:
+            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
+            readPosition += 8
+        else:
+            readPosition += 4
+
+        if embeddedTime > (int(time.time()) + 10800):  # prevent funny business
+            print 'The embedded time in this broadcast message is more than three hours in the future. That doesn\'t make sense. Ignoring message.'
+            return
+        if embeddedTime < (int(time.time()) - shared.maximumAgeOfAnObjectThatIAmWillingToAccept):
+            print 'The embedded time in this broadcast message is too old. Ignoring message.'
+            return
+        if len(data) < 180:
+            print 'The payload length of this broadcast packet is unreasonably low. Someone is probably trying funny business. Ignoring message.'
+            return
+        # Let us check to make sure the stream number is correct (thus
+        # preventing an individual from sending broadcasts out on the wrong
+        # streams or all streams).
+        broadcastVersion, broadcastVersionLength = decodeVarint(
+            data[readPosition:readPosition + 10])
+        if broadcastVersion >= 2:
+            streamNumber, streamNumberLength = decodeVarint(data[
+                                                            readPosition + broadcastVersionLength:readPosition + broadcastVersionLength + 10])
+            if streamNumber != self.streamNumber:
+                print 'The stream number encoded in this broadcast message (' + str(streamNumber) + ') does not match the stream number on which it was received. Ignoring it.'
+                return
+
+        shared.inventoryLock.acquire()
+        self.inventoryHash = calculateInventoryHash(data)
+        if self.inventoryHash in shared.inventory:
+            print 'We have already received this broadcast object. Ignoring.'
+            shared.inventoryLock.release()
+            return
+        elif shared.isInSqlInventory(self.inventoryHash):
+            print 'We have already received this broadcast object (it is stored on disk in the SQL inventory). Ignoring it.'
+            shared.inventoryLock.release()
+            return
+        # It is valid so far. Let's let our peers know about it.
+        objectType = 'broadcast'
+        shared.inventory[self.inventoryHash] = (
+            objectType, self.streamNumber, data, embeddedTime)
+        shared.inventoryLock.release()
+        self.broadcastinv(self.inventoryHash)
+        shared.UISignalQueue.put((
+            'incrementNumberOfBroadcastsProcessed', 'no data'))
+
+        self.processbroadcast(
+            readPosition, data)  # When this function returns, we will have either successfully processed this broadcast because we are interested in it, ignored it because we aren't interested in it, or found problem with the broadcast that warranted ignoring it.
+
+        # Let us now set lengthOfTimeWeShouldUseToProcessThisMessage. If we
+        # haven't used the specified amount of time, we shall sleep. These
+        # values are mostly the same values used for msg messages although
+        # broadcast messages are processed faster.
+        if len(data) > 100000000:  # Size is greater than 100 megabytes
+            lengthOfTimeWeShouldUseToProcessThisMessage = 100  # seconds.
+        elif len(data) > 10000000:  # Between 100 and 10 megabytes
+            lengthOfTimeWeShouldUseToProcessThisMessage = 20  # seconds.
+        elif len(data) > 1000000:  # Between 10 and 1 megabyte
+            lengthOfTimeWeShouldUseToProcessThisMessage = 3  # seconds.
+        else:  # Less than 1 megabyte
+            lengthOfTimeWeShouldUseToProcessThisMessage = .6  # seconds.
+
+        sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
+            (time.time() - self.messageProcessingStartTime)
+        if sleepTime > 0 and doTimingAttackMitigation:
+            with shared.printLock:
+                print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
+
+            time.sleep(sleepTime)
+        with shared.printLock:
+            print 'Total message processing time:', time.time() - self.messageProcessingStartTime, 'seconds.'
+
+
+    # A broadcast message has a valid time and POW and requires processing.
+    # The recbroadcast function calls this one.
+    def processbroadcast(self, readPosition, data):
+        broadcastVersion, broadcastVersionLength = decodeVarint(
+            data[readPosition:readPosition + 9])
+        readPosition += broadcastVersionLength
+        if broadcastVersion < 1 or broadcastVersion > 2:
+            print 'Cannot decode incoming broadcast versions higher than 2. Assuming the sender isn\'t being silly, you should upgrade Bitmessage because this message shall be ignored.'
+            return
+        if broadcastVersion == 1:
+            beginningOfPubkeyPosition = readPosition  # used when we add the pubkey to our pubkey table
+            sendersAddressVersion, sendersAddressVersionLength = decodeVarint(
+                data[readPosition:readPosition + 9])
+            if sendersAddressVersion <= 1 or sendersAddressVersion >= 3:
+                # Cannot decode senderAddressVersion higher than 2. Assuming
+                # the sender isn\'t being silly, you should upgrade Bitmessage
+                # because this message shall be ignored.
+                return
+            readPosition += sendersAddressVersionLength
+            if sendersAddressVersion == 2:
+                sendersStream, sendersStreamLength = decodeVarint(
+                    data[readPosition:readPosition + 9])
+                readPosition += sendersStreamLength
+                behaviorBitfield = data[readPosition:readPosition + 4]
+                readPosition += 4
+                sendersPubSigningKey = '\x04' + \
+                    data[readPosition:readPosition + 64]
+                readPosition += 64
+                sendersPubEncryptionKey = '\x04' + \
+                    data[readPosition:readPosition + 64]
+                readPosition += 64
+                endOfPubkeyPosition = readPosition
+                sendersHash = data[readPosition:readPosition + 20]
+                if sendersHash not in shared.broadcastSendersForWhichImWatching:
+                    # Display timing data
+                    with shared.printLock:
+                        print 'Time spent deciding that we are not interested in this v1 broadcast:', time.time() - self.messageProcessingStartTime
+
+                    return
+                # At this point, this message claims to be from sendersHash and
+                # we are interested in it. We still have to hash the public key
+                # to make sure it is truly the key that matches the hash, and
+                # also check the signiture.
+                readPosition += 20
+
+                sha = hashlib.new('sha512')
+                sha.update(sendersPubSigningKey + sendersPubEncryptionKey)
+                ripe = hashlib.new('ripemd160')
+                ripe.update(sha.digest())
+                if ripe.digest() != sendersHash:
+                    # The sender of this message lied.
+                    return
+                messageEncodingType, messageEncodingTypeLength = decodeVarint(
+                    data[readPosition:readPosition + 9])
+                if messageEncodingType == 0:
+                    return
+                readPosition += messageEncodingTypeLength
+                messageLength, messageLengthLength = decodeVarint(
+                    data[readPosition:readPosition + 9])
+                readPosition += messageLengthLength
+                message = data[readPosition:readPosition + messageLength]
+                readPosition += messageLength
+                readPositionAtBottomOfMessage = readPosition
+                signatureLength, signatureLengthLength = decodeVarint(
+                    data[readPosition:readPosition + 9])
+                readPosition += signatureLengthLength
+                signature = data[readPosition:readPosition + signatureLength]
+                try:
+                    if not highlevelcrypto.verify(data[12:readPositionAtBottomOfMessage], signature, sendersPubSigningKey.encode('hex')):
+                        print 'ECDSA verify failed'
+                        return
+                    print 'ECDSA verify passed'
+                except Exception as err:
+                    print 'ECDSA verify failed', err
+                    return
+                # verify passed
+
+                # Let's store the public key in case we want to reply to this person.
+                # We don't have the correct nonce or time (which would let us
+                # send out a pubkey message) so we'll just fill it with 1's. We
+                # won't be able to send this pubkey to others (without doing
+                # the proof of work ourselves, which this program is programmed
+                # to not do.)
+                t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + data[
+                     beginningOfPubkeyPosition:endOfPubkeyPosition], int(time.time()), 'yes')
+                shared.sqlLock.acquire()
+                shared.sqlSubmitQueue.put(
+                    '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
+                shared.sqlSubmitQueue.put(t)
+                shared.sqlReturnQueue.get()
+                shared.sqlSubmitQueue.put('commit')
+                shared.sqlLock.release()
+                # shared.workerQueue.put(('newpubkey',(sendersAddressVersion,sendersStream,ripe.digest())))
+                # This will check to see whether we happen to be awaiting this
+                # pubkey in order to send a message. If we are, it will do the
+                # POW and send it.
+                self.possibleNewPubkey(ripe.digest())
+
+                fromAddress = encodeAddress(
+                    sendersAddressVersion, sendersStream, ripe.digest())
+                with shared.printLock:
+                    print 'fromAddress:', fromAddress
+
+                if messageEncodingType == 2:
+                    subject, body = self.decodeType2Message(message)
+                elif messageEncodingType == 1:
+                    body = message
+                    subject = ''
+                elif messageEncodingType == 0:
+                    print 'messageEncodingType == 0. Doing nothing with the message.'
+                else:
+                    body = 'Unknown encoding type.\n\n' + repr(message)
+                    subject = ''
+
+                toAddress = '[Broadcast subscribers]'
+                if messageEncodingType != 0:
+                    
+                    t = (self.inventoryHash, toAddress, fromAddress, subject, int(
+                        time.time()), body, 'inbox', messageEncodingType, 0)
+                    helper_inbox.insert(t)
+                    
+                    shared.UISignalQueue.put(('displayNewInboxMessage', (
+                        self.inventoryHash, toAddress, fromAddress, subject, body)))
+
+                    # If we are behaving as an API then we might need to run an
+                    # outside command to let some program know that a new
+                    # message has arrived.
+                    if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
+                        try:
+                            apiNotifyPath = shared.config.get(
+                                'bitmessagesettings', 'apinotifypath')
+                        except:
+                            apiNotifyPath = ''
+                        if apiNotifyPath != '':
+                            call([apiNotifyPath, "newBroadcast"])
+
+                # Display timing data
+                with shared.printLock:
+                    print 'Time spent processing this interesting broadcast:', time.time() - self.messageProcessingStartTime
+
+        if broadcastVersion == 2:
+            cleartextStreamNumber, cleartextStreamNumberLength = decodeVarint(
+                data[readPosition:readPosition + 10])
+            readPosition += cleartextStreamNumberLength
+            initialDecryptionSuccessful = False
+            for key, cryptorObject in shared.MyECSubscriptionCryptorObjects.items():
+                try:
+                    decryptedData = cryptorObject.decrypt(data[readPosition:])
+                    toRipe = key  # This is the RIPE hash of the sender's pubkey. We need this below to compare to the RIPE hash of the sender's address to verify that it was encrypted by with their key rather than some other key.
+                    initialDecryptionSuccessful = True
+                    print 'EC decryption successful using key associated with ripe hash:', key.encode('hex')
+                    break
+                except Exception as err:
+                    pass
+                    # print 'cryptorObject.decrypt Exception:', err
+            if not initialDecryptionSuccessful:
+                # This is not a broadcast I am interested in.
+                with shared.printLock:
+                    print 'Length of time program spent failing to decrypt this v2 broadcast:', time.time() - self.messageProcessingStartTime, 'seconds.'
+
+                return
+            # At this point this is a broadcast I have decrypted and thus am
+            # interested in.
+            signedBroadcastVersion, readPosition = decodeVarint(
+                decryptedData[:10])
+            beginningOfPubkeyPosition = readPosition  # used when we add the pubkey to our pubkey table
+            sendersAddressVersion, sendersAddressVersionLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 9])
+            if sendersAddressVersion < 2 or sendersAddressVersion > 3:
+                print 'Cannot decode senderAddressVersion other than 2 or 3. Assuming the sender isn\'t being silly, you should upgrade Bitmessage because this message shall be ignored.'
+                return
+            readPosition += sendersAddressVersionLength
+            sendersStream, sendersStreamLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 9])
+            if sendersStream != cleartextStreamNumber:
+                print 'The stream number outside of the encryption on which the POW was completed doesn\'t match the stream number inside the encryption. Ignoring broadcast.'
+                return
+            readPosition += sendersStreamLength
+            behaviorBitfield = decryptedData[readPosition:readPosition + 4]
+            readPosition += 4
+            sendersPubSigningKey = '\x04' + \
+                decryptedData[readPosition:readPosition + 64]
+            readPosition += 64
+            sendersPubEncryptionKey = '\x04' + \
+                decryptedData[readPosition:readPosition + 64]
+            readPosition += 64
+            if sendersAddressVersion >= 3:
+                requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(
+                    decryptedData[readPosition:readPosition + 10])
+                readPosition += varintLength
+                print 'sender\'s requiredAverageProofOfWorkNonceTrialsPerByte is', requiredAverageProofOfWorkNonceTrialsPerByte
+                requiredPayloadLengthExtraBytes, varintLength = decodeVarint(
+                    decryptedData[readPosition:readPosition + 10])
+                readPosition += varintLength
+                print 'sender\'s requiredPayloadLengthExtraBytes is', requiredPayloadLengthExtraBytes
+            endOfPubkeyPosition = readPosition
+
+            sha = hashlib.new('sha512')
+            sha.update(sendersPubSigningKey + sendersPubEncryptionKey)
+            ripe = hashlib.new('ripemd160')
+            ripe.update(sha.digest())
+
+            if toRipe != ripe.digest():
+                print 'The encryption key used to encrypt this message doesn\'t match the keys inbedded in the message itself. Ignoring message.'
+                return
+            messageEncodingType, messageEncodingTypeLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 9])
+            if messageEncodingType == 0:
+                return
+            readPosition += messageEncodingTypeLength
+            messageLength, messageLengthLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 9])
+            readPosition += messageLengthLength
+            message = decryptedData[readPosition:readPosition + messageLength]
+            readPosition += messageLength
+            readPositionAtBottomOfMessage = readPosition
+            signatureLength, signatureLengthLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 9])
+            readPosition += signatureLengthLength
+            signature = decryptedData[
+                readPosition:readPosition + signatureLength]
+            try:
+                if not highlevelcrypto.verify(decryptedData[:readPositionAtBottomOfMessage], signature, sendersPubSigningKey.encode('hex')):
+                    print 'ECDSA verify failed'
+                    return
+                print 'ECDSA verify passed'
+            except Exception as err:
+                print 'ECDSA verify failed', err
+                return
+            # verify passed
+
+            # Let's store the public key in case we want to reply to this
+            # person.
+            t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + decryptedData[
+                 beginningOfPubkeyPosition:endOfPubkeyPosition], int(time.time()), 'yes')
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
+            shared.sqlSubmitQueue.put(t)
+            shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            shared.sqlLock.release()
+            # shared.workerQueue.put(('newpubkey',(sendersAddressVersion,sendersStream,ripe.digest())))
+            # This will check to see whether we happen to be awaiting this
+            # pubkey in order to send a message. If we are, it will do the POW
+            # and send it.
+            self.possibleNewPubkey(ripe.digest())
+
+            fromAddress = encodeAddress(
+                sendersAddressVersion, sendersStream, ripe.digest())
+            with shared.printLock:
+                print 'fromAddress:', fromAddress
+
+            if messageEncodingType == 2:
+                subject, body = self.decodeType2Message(message)
+            elif messageEncodingType == 1:
+                body = message
+                subject = ''
+            elif messageEncodingType == 0:
+                print 'messageEncodingType == 0. Doing nothing with the message.'
+            else:
+                body = 'Unknown encoding type.\n\n' + repr(message)
+                subject = ''
+
+            toAddress = '[Broadcast subscribers]'
+            if messageEncodingType != 0:
+                
+                t = (self.inventoryHash, toAddress, fromAddress, subject, int(
+                    time.time()), body, 'inbox', messageEncodingType, 0)
+                helper_inbox.insert(t)
+                
+                shared.UISignalQueue.put(('displayNewInboxMessage', (
+                    self.inventoryHash, toAddress, fromAddress, subject, body)))
+
+                # If we are behaving as an API then we might need to run an
+                # outside command to let some program know that a new message
+                # has arrived.
+                if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
+                    try:
+                        apiNotifyPath = shared.config.get(
+                            'bitmessagesettings', 'apinotifypath')
+                    except:
+                        apiNotifyPath = ''
+                    if apiNotifyPath != '':
+                        call([apiNotifyPath, "newBroadcast"])
+
+            # Display timing data
+            with shared.printLock:
+                print 'Time spent processing this interesting broadcast:', time.time() - self.messageProcessingStartTime
+
+
+    # We have received a msg message.
+    def recmsg(self, data):
+        self.messageProcessingStartTime = time.time()
+        # First we must check to make sure the proof of work is sufficient.
+        if not self.isProofOfWorkSufficient(data):
+            print 'Proof of work in msg message insufficient.'
+            return
+
+        readPosition = 8
+        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
+
+        # This section is used for the transition from 32 bit time to 64 bit
+        # time in the protocol.
+        if embeddedTime == 0:
+            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
+            readPosition += 8
+        else:
+            readPosition += 4
+
+        if embeddedTime > int(time.time()) + 10800:
+            print 'The time in the msg message is too new. Ignoring it. Time:', embeddedTime
+            return
+        if embeddedTime < int(time.time()) - shared.maximumAgeOfAnObjectThatIAmWillingToAccept:
+            print 'The time in the msg message is too old. Ignoring it. Time:', embeddedTime
+            return
+        streamNumberAsClaimedByMsg, streamNumberAsClaimedByMsgLength = decodeVarint(
+            data[readPosition:readPosition + 9])
+        if streamNumberAsClaimedByMsg != self.streamNumber:
+            print 'The stream number encoded in this msg (' + str(streamNumberAsClaimedByMsg) + ') message does not match the stream number on which it was received. Ignoring it.'
+            return
+        readPosition += streamNumberAsClaimedByMsgLength
+        self.inventoryHash = calculateInventoryHash(data)
+        shared.inventoryLock.acquire()
+        if self.inventoryHash in shared.inventory:
+            print 'We have already received this msg message. Ignoring.'
+            shared.inventoryLock.release()
+            return
+        elif shared.isInSqlInventory(self.inventoryHash):
+            print 'We have already received this msg message (it is stored on disk in the SQL inventory). Ignoring it.'
+            shared.inventoryLock.release()
+            return
+        # This msg message is valid. Let's let our peers know about it.
+        objectType = 'msg'
+        shared.inventory[self.inventoryHash] = (
+            objectType, self.streamNumber, data, embeddedTime)
+        shared.inventoryLock.release()
+        self.broadcastinv(self.inventoryHash)
+        shared.UISignalQueue.put((
+            'incrementNumberOfMessagesProcessed', 'no data'))
+
+        self.processmsg(
+            readPosition, data)  # When this function returns, we will have either successfully processed the message bound for us, ignored it because it isn't bound for us, or found problem with the message that warranted ignoring it.
+
+        # Let us now set lengthOfTimeWeShouldUseToProcessThisMessage. If we
+        # haven't used the specified amount of time, we shall sleep. These
+        # values are based on test timings and you may change them at-will.
+        if len(data) > 100000000:  # Size is greater than 100 megabytes
+            lengthOfTimeWeShouldUseToProcessThisMessage = 100  # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 100 MB message: 3.7 seconds.
+        elif len(data) > 10000000:  # Between 100 and 10 megabytes
+            lengthOfTimeWeShouldUseToProcessThisMessage = 20  # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 10 MB message: 0.53 seconds. Actual length of time it takes in practice when processing a real message: 1.44 seconds.
+        elif len(data) > 1000000:  # Between 10 and 1 megabyte
+            lengthOfTimeWeShouldUseToProcessThisMessage = 3  # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 1 MB message: 0.18 seconds. Actual length of time it takes in practice when processing a real message: 0.30 seconds.
+        else:  # Less than 1 megabyte
+            lengthOfTimeWeShouldUseToProcessThisMessage = .6  # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 100 KB message: 0.15 seconds. Actual length of time it takes in practice when processing a real message: 0.25 seconds.
+
+        sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
+            (time.time() - self.messageProcessingStartTime)
+        if sleepTime > 0 and doTimingAttackMitigation:
+            with shared.printLock:
+                print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
+
+            time.sleep(sleepTime)
+        with shared.printLock:
+            print 'Total message processing time:', time.time() - self.messageProcessingStartTime, 'seconds.'
+
+
+    # A msg message has a valid time and POW and requires processing. The
+    # recmsg function calls this one.
+    def processmsg(self, readPosition, encryptedData):
+        initialDecryptionSuccessful = False
+        # Let's check whether this is a message acknowledgement bound for us.
+        if encryptedData[readPosition:] in shared.ackdataForWhichImWatching:
+            with shared.printLock:
+                print 'This msg IS an acknowledgement bound for me.'
+
+            del shared.ackdataForWhichImWatching[encryptedData[readPosition:]]
+            t = ('ackreceived', encryptedData[readPosition:])
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                'UPDATE sent SET status=? WHERE ackdata=?')
+            shared.sqlSubmitQueue.put(t)
+            shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            shared.sqlLock.release()
+            shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (encryptedData[readPosition:], tr.translateText("MainWindow",'Acknowledgement of the message received. %1').arg(unicode(
+                time.strftime(shared.config.get('bitmessagesettings', 'timeformat'), time.localtime(int(time.time()))), 'utf-8')))))
+            return
+        else:
+            with shared.printLock:
+                print 'This was NOT an acknowledgement bound for me.'
+            # print 'shared.ackdataForWhichImWatching', shared.ackdataForWhichImWatching
+
+
+        # This is not an acknowledgement bound for me. See if it is a message
+        # bound for me by trying to decrypt it with my private keys.
+        for key, cryptorObject in shared.myECCryptorObjects.items():
+            try:
+                decryptedData = cryptorObject.decrypt(
+                    encryptedData[readPosition:])
+                toRipe = key  # This is the RIPE hash of my pubkeys. We need this below to compare to the destination_ripe included in the encrypted data.
+                initialDecryptionSuccessful = True
+                with shared.printLock:
+                    print 'EC decryption successful using key associated with ripe hash:', key.encode('hex')
+                break
+            except Exception as err:
+                pass
+                # print 'cryptorObject.decrypt Exception:', err
+        if not initialDecryptionSuccessful:
+            # This is not a message bound for me.
+            with shared.printLock:
+                print 'Length of time program spent failing to decrypt this message:', time.time() - self.messageProcessingStartTime, 'seconds.'
+
+        else:
+            # This is a message bound for me.
+            toAddress = shared.myAddressesByHash[
+                toRipe]  # Look up my address based on the RIPE hash.
+            readPosition = 0
+            messageVersion, messageVersionLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 10])
+            readPosition += messageVersionLength
+            if messageVersion != 1:
+                print 'Cannot understand message versions other than one. Ignoring message.'
+                return
+            sendersAddressVersionNumber, sendersAddressVersionNumberLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 10])
+            readPosition += sendersAddressVersionNumberLength
+            if sendersAddressVersionNumber == 0:
+                print 'Cannot understand sendersAddressVersionNumber = 0. Ignoring message.'
+                return
+            if sendersAddressVersionNumber >= 4:
+                print 'Sender\'s address version number', sendersAddressVersionNumber, 'not yet supported. Ignoring message.'
+                return
+            if len(decryptedData) < 170:
+                print 'Length of the unencrypted data is unreasonably short. Sanity check failed. Ignoring message.'
+                return
+            sendersStreamNumber, sendersStreamNumberLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 10])
+            if sendersStreamNumber == 0:
+                print 'sender\'s stream number is 0. Ignoring message.'
+                return
+            readPosition += sendersStreamNumberLength
+            behaviorBitfield = decryptedData[readPosition:readPosition + 4]
+            readPosition += 4
+            pubSigningKey = '\x04' + decryptedData[
+                readPosition:readPosition + 64]
+            readPosition += 64
+            pubEncryptionKey = '\x04' + decryptedData[
+                readPosition:readPosition + 64]
+            readPosition += 64
+            if sendersAddressVersionNumber >= 3:
+                requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(
+                    decryptedData[readPosition:readPosition + 10])
+                readPosition += varintLength
+                print 'sender\'s requiredAverageProofOfWorkNonceTrialsPerByte is', requiredAverageProofOfWorkNonceTrialsPerByte
+                requiredPayloadLengthExtraBytes, varintLength = decodeVarint(
+                    decryptedData[readPosition:readPosition + 10])
+                readPosition += varintLength
+                print 'sender\'s requiredPayloadLengthExtraBytes is', requiredPayloadLengthExtraBytes
+            endOfThePublicKeyPosition = readPosition  # needed for when we store the pubkey in our database of pubkeys for later use.
+            if toRipe != decryptedData[readPosition:readPosition + 20]:
+                with shared.printLock:
+                    print 'The original sender of this message did not send it to you. Someone is attempting a Surreptitious Forwarding Attack.'
+                    print 'See: http://world.std.com/~dtd/sign_encrypt/sign_encrypt7.html'
+                    print 'your toRipe:', toRipe.encode('hex')
+                    print 'embedded destination toRipe:', decryptedData[readPosition:readPosition + 20].encode('hex')
+
+                return
+            readPosition += 20
+            messageEncodingType, messageEncodingTypeLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 10])
+            readPosition += messageEncodingTypeLength
+            messageLength, messageLengthLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 10])
+            readPosition += messageLengthLength
+            message = decryptedData[readPosition:readPosition + messageLength]
+            # print 'First 150 characters of message:', repr(message[:150])
+            readPosition += messageLength
+            ackLength, ackLengthLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 10])
+            readPosition += ackLengthLength
+            ackData = decryptedData[readPosition:readPosition + ackLength]
+            readPosition += ackLength
+            positionOfBottomOfAckData = readPosition  # needed to mark the end of what is covered by the signature
+            signatureLength, signatureLengthLength = decodeVarint(
+                decryptedData[readPosition:readPosition + 10])
+            readPosition += signatureLengthLength
+            signature = decryptedData[
+                readPosition:readPosition + signatureLength]
+            try:
+                if not highlevelcrypto.verify(decryptedData[:positionOfBottomOfAckData], signature, pubSigningKey.encode('hex')):
+                    print 'ECDSA verify failed'
+                    return
+                print 'ECDSA verify passed'
+            except Exception as err:
+                print 'ECDSA verify failed', err
+                return
+            with shared.printLock:
+                print 'As a matter of intellectual curiosity, here is the Bitcoin address associated with the keys owned by the other person:', helper_bitcoin.calculateBitcoinAddressFromPubkey(pubSigningKey), '  ..and here is the testnet address:', helper_bitcoin.calculateTestnetAddressFromPubkey(pubSigningKey), '. The other person must take their private signing key from Bitmessage and import it into Bitcoin (or a service like Blockchain.info) for it to be of any use. Do not use this unless you know what you are doing.'
+
+            # calculate the fromRipe.
+            sha = hashlib.new('sha512')
+            sha.update(pubSigningKey + pubEncryptionKey)
+            ripe = hashlib.new('ripemd160')
+            ripe.update(sha.digest())
+            # Let's store the public key in case we want to reply to this
+            # person.
+            t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + decryptedData[
+                 messageVersionLength:endOfThePublicKeyPosition], int(time.time()), 'yes')
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
+            shared.sqlSubmitQueue.put(t)
+            shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            shared.sqlLock.release()
+            # shared.workerQueue.put(('newpubkey',(sendersAddressVersionNumber,sendersStreamNumber,ripe.digest())))
+            # This will check to see whether we happen to be awaiting this
+            # pubkey in order to send a message. If we are, it will do the POW
+            # and send it.
+            self.possibleNewPubkey(ripe.digest())
+            fromAddress = encodeAddress(
+                sendersAddressVersionNumber, sendersStreamNumber, ripe.digest())
+            # If this message is bound for one of my version 3 addresses (or
+            # higher), then we must check to make sure it meets our demanded
+            # proof of work requirement.
+            if decodeAddress(toAddress)[1] >= 3:  # If the toAddress version number is 3 or higher:
+                if not shared.isAddressInMyAddressBookSubscriptionsListOrWhitelist(fromAddress):  # If I'm not friendly with this person:
+                    requiredNonceTrialsPerByte = shared.config.getint(
+                        toAddress, 'noncetrialsperbyte')
+                    requiredPayloadLengthExtraBytes = shared.config.getint(
+                        toAddress, 'payloadlengthextrabytes')
+                    if not self.isProofOfWorkSufficient(encryptedData, requiredNonceTrialsPerByte, requiredPayloadLengthExtraBytes):
+                        print 'Proof of work in msg message insufficient only because it does not meet our higher requirement.'
+                        return
+            blockMessage = False  # Gets set to True if the user shouldn't see the message according to black or white lists.
+            if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black':  # If we are using a blacklist
+                t = (fromAddress,)
+                shared.sqlLock.acquire()
+                shared.sqlSubmitQueue.put(
+                    '''SELECT label FROM blacklist where address=? and enabled='1' ''')
+                shared.sqlSubmitQueue.put(t)
+                queryreturn = shared.sqlReturnQueue.get()
+                shared.sqlLock.release()
+                if queryreturn != []:
+                    with shared.printLock:
+                        print 'Message ignored because address is in blacklist.'
+
+                    blockMessage = True
+            else:  # We're using a whitelist
+                t = (fromAddress,)
+                shared.sqlLock.acquire()
+                shared.sqlSubmitQueue.put(
+                    '''SELECT label FROM whitelist where address=? and enabled='1' ''')
+                shared.sqlSubmitQueue.put(t)
+                queryreturn = shared.sqlReturnQueue.get()
+                shared.sqlLock.release()
+                if queryreturn == []:
+                    print 'Message ignored because address not in whitelist.'
+                    blockMessage = True
+            if not blockMessage:
+                print 'fromAddress:', fromAddress
+                print 'First 150 characters of message:', repr(message[:150])
+
+                toLabel = shared.config.get(toAddress, 'label')
+                if toLabel == '':
+                    toLabel = toAddress
+
+                if messageEncodingType == 2:
+                    subject, body = self.decodeType2Message(message)
+                elif messageEncodingType == 1:
+                    body = message
+                    subject = ''
+                elif messageEncodingType == 0:
+                    print 'messageEncodingType == 0. Doing nothing with the message. They probably just sent it so that we would store their public key or send their ack data for them.'
+                else:
+                    body = 'Unknown encoding type.\n\n' + repr(message)
+                    subject = ''
+                if messageEncodingType != 0:
+                    t = (self.inventoryHash, toAddress, fromAddress, subject, int(
+                        time.time()), body, 'inbox', messageEncodingType, 0)
+                    helper_inbox.insert(t)
+                    
+                    shared.UISignalQueue.put(('displayNewInboxMessage', (
+                        self.inventoryHash, toAddress, fromAddress, subject, body)))
+
+                # If we are behaving as an API then we might need to run an
+                # outside command to let some program know that a new message
+                # has arrived.
+                if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
+                    try:
+                        apiNotifyPath = shared.config.get(
+                            'bitmessagesettings', 'apinotifypath')
+                    except:
+                        apiNotifyPath = ''
+                    if apiNotifyPath != '':
+                        call([apiNotifyPath, "newMessage"])
+
+                # Let us now check and see whether our receiving address is
+                # behaving as a mailing list
+                if shared.safeConfigGetBoolean(toAddress, 'mailinglist'):
+                    try:
+                        mailingListName = shared.config.get(
+                            toAddress, 'mailinglistname')
+                    except:
+                        mailingListName = ''
+                    # Let us send out this message as a broadcast
+                    subject = self.addMailingListNameToSubject(
+                        subject, mailingListName)
+                    # Let us now send this message out as a broadcast
+                    message = time.strftime("%a, %Y-%m-%d %H:%M:%S UTC", time.gmtime(
+                    )) + '   Message ostensibly from ' + fromAddress + ':\n\n' + body
+                    fromAddress = toAddress  # The fromAddress for the broadcast that we are about to send is the toAddress (my address) for the msg message we are currently processing.
+                    ackdata = OpenSSL.rand(
+                        32)  # We don't actually need the ackdata for acknowledgement since this is a broadcast message but we can use it to update the user interface when the POW is done generating.
+                    toAddress = '[Broadcast subscribers]'
+                    ripe = ''
+                    
+                    t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int(
+                        time.time()), 'broadcastqueued', 1, 1, 'sent', 2)
+                    helper_sent.insert(t)
+
+                    shared.UISignalQueue.put(('displayNewSentMessage', (
+                        toAddress, '[Broadcast subscribers]', fromAddress, subject, message, ackdata)))
+                    shared.workerQueue.put(('sendbroadcast', ''))
+
+            if self.isAckDataValid(ackData):
+                print 'ackData is valid. Will process it.'
+                self.ackDataThatWeHaveYetToSend.append(
+                    ackData)  # When we have processed all data, the processData function will pop the ackData out and process it as if it is a message received from our peer.
+            # Display timing data
+            timeRequiredToAttemptToDecryptMessage = time.time(
+            ) - self.messageProcessingStartTime
+            shared.successfullyDecryptMessageTimings.append(
+                timeRequiredToAttemptToDecryptMessage)
+            sum = 0
+            for item in shared.successfullyDecryptMessageTimings:
+                sum += item
+            with shared.printLock:
+                print 'Time to decrypt this message successfully:', timeRequiredToAttemptToDecryptMessage
+                print 'Average time for all message decryption successes since startup:', sum / len(shared.successfullyDecryptMessageTimings)
+
+    def decodeType2Message(self, message):
+        bodyPositionIndex = string.find(message, '\nBody:')
+        if bodyPositionIndex > 1:
+            subject = message[8:bodyPositionIndex]
+            # Only save and show the first 500 characters of the subject.
+            # Any more is probably an attack.
+            subject = subject[:500]
+            body = message[bodyPositionIndex + 6:]
+        else:
+            subject = ''
+            body = message
+        # Throw away any extra lines (headers) after the subject.
+        if subject:
+            subject = subject.splitlines()[0]
+        return subject, body
+
+    def isAckDataValid(self, ackData):
+        if len(ackData) < 24:
+            print 'The length of ackData is unreasonably short. Not sending ackData.'
+            return False
+        if ackData[0:4] != '\xe9\xbe\xb4\xd9':
+            print 'Ackdata magic bytes were wrong. Not sending ackData.'
+            return False
+        ackDataPayloadLength, = unpack('>L', ackData[16:20])
+        if len(ackData) - 24 != ackDataPayloadLength:
+            print 'ackData payload length doesn\'t match the payload length specified in the header. Not sending ackdata.'
+            return False
+        if ackData[4:16] != 'getpubkey\x00\x00\x00' and ackData[4:16] != 'pubkey\x00\x00\x00\x00\x00\x00' and ackData[4:16] != 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' and ackData[4:16] != 'broadcast\x00\x00\x00':
+            return False
+        return True
+
+    def addMailingListNameToSubject(self, subject, mailingListName):
+        subject = subject.strip()
+        if subject[:3] == 'Re:' or subject[:3] == 'RE:':
+            subject = subject[3:].strip()
+        if '[' + mailingListName + ']' in subject:
+            return subject
+        else:
+            return '[' + mailingListName + '] ' + subject
+
+    def possibleNewPubkey(self, toRipe):
+        if toRipe in shared.neededPubkeys:
+            print 'We have been awaiting the arrival of this pubkey.'
+            del shared.neededPubkeys[toRipe]
+            t = (toRipe,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''UPDATE sent SET status='doingmsgpow' WHERE toripe=? AND (status='awaitingpubkey' or status='doingpubkeypow') and folder='sent' ''')
+            shared.sqlSubmitQueue.put(t)
+            shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            shared.sqlLock.release()
+            shared.workerQueue.put(('sendmessage', ''))
+        else:
+            with shared.printLock:
+                print 'We don\'t need this pub key. We didn\'t ask for it. Pubkey hash:', toRipe.encode('hex')
+
+
+    # We have received a pubkey
+    def recpubkey(self, data):
+        self.pubkeyProcessingStartTime = time.time()
+        if len(data) < 146 or len(data) > 600:  # sanity check
+            return
+        # We must check to make sure the proof of work is sufficient.
+        if not self.isProofOfWorkSufficient(data):
+            print 'Proof of work in pubkey message insufficient.'
+            return
+
+        readPosition = 8  # for the nonce
+        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
+
+        # This section is used for the transition from 32 bit time to 64 bit
+        # time in the protocol.
+        if embeddedTime == 0:
+            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
+            readPosition += 8
+        else:
+            readPosition += 4
+
+        if embeddedTime < int(time.time()) - shared.lengthOfTimeToHoldOnToAllPubkeys:
+            with shared.printLock:
+                print 'The embedded time in this pubkey message is too old. Ignoring. Embedded time is:', embeddedTime
+
+            return
+        if embeddedTime > int(time.time()) + 10800:
+            with shared.printLock:
+                print 'The embedded time in this pubkey message more than several hours in the future. This is irrational. Ignoring message.'
+
+            return
+        addressVersion, varintLength = decodeVarint(
+            data[readPosition:readPosition + 10])
+        readPosition += varintLength
+        streamNumber, varintLength = decodeVarint(
+            data[readPosition:readPosition + 10])
+        readPosition += varintLength
+        if self.streamNumber != streamNumber:
+            print 'stream number embedded in this pubkey doesn\'t match our stream number. Ignoring.'
+            return
+
+        inventoryHash = calculateInventoryHash(data)
+        shared.inventoryLock.acquire()
+        if inventoryHash in shared.inventory:
+            print 'We have already received this pubkey. Ignoring it.'
+            shared.inventoryLock.release()
+            return
+        elif shared.isInSqlInventory(inventoryHash):
+            print 'We have already received this pubkey (it is stored on disk in the SQL inventory). Ignoring it.'
+            shared.inventoryLock.release()
+            return
+        objectType = 'pubkey'
+        shared.inventory[inventoryHash] = (
+            objectType, self.streamNumber, data, embeddedTime)
+        shared.inventoryLock.release()
+        self.broadcastinv(inventoryHash)
+        shared.UISignalQueue.put((
+            'incrementNumberOfPubkeysProcessed', 'no data'))
+
+        self.processpubkey(data)
+
+        lengthOfTimeWeShouldUseToProcessThisMessage = .2
+        sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
+            (time.time() - self.pubkeyProcessingStartTime)
+        if sleepTime > 0 and doTimingAttackMitigation:
+            with shared.printLock:
+                print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
+
+            time.sleep(sleepTime)
+        with shared.printLock:
+            print 'Total pubkey processing time:', time.time() - self.pubkeyProcessingStartTime, 'seconds.'
+
+
+    def processpubkey(self, data):
+        readPosition = 8  # for the nonce
+        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
+
+        # This section is used for the transition from 32 bit time to 64 bit
+        # time in the protocol.
+        if embeddedTime == 0:
+            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
+            readPosition += 8
+        else:
+            readPosition += 4
+
+        addressVersion, varintLength = decodeVarint(
+            data[readPosition:readPosition + 10])
+        readPosition += varintLength
+        streamNumber, varintLength = decodeVarint(
+            data[readPosition:readPosition + 10])
+        readPosition += varintLength
+        if addressVersion == 0:
+            print '(Within processpubkey) addressVersion of 0 doesn\'t make sense.'
+            return
+        if addressVersion >= 4 or addressVersion == 1:
+            with shared.printLock:
+                print 'This version of Bitmessage cannot handle version', addressVersion, 'addresses.'
+
+            return
+        if addressVersion == 2:
+            if len(data) < 146:  # sanity check. This is the minimum possible length.
+                print '(within processpubkey) payloadLength less than 146. Sanity check failed.'
+                return
+            bitfieldBehaviors = data[readPosition:readPosition + 4]
+            readPosition += 4
+            publicSigningKey = data[readPosition:readPosition + 64]
+            # Is it possible for a public key to be invalid such that trying to
+            # encrypt or sign with it will cause an error? If it is, we should
+            # probably test these keys here.
+            readPosition += 64
+            publicEncryptionKey = data[readPosition:readPosition + 64]
+            if len(publicEncryptionKey) < 64:
+                print 'publicEncryptionKey length less than 64. Sanity check failed.'
+                return
+            sha = hashlib.new('sha512')
+            sha.update(
+                '\x04' + publicSigningKey + '\x04' + publicEncryptionKey)
+            ripeHasher = hashlib.new('ripemd160')
+            ripeHasher.update(sha.digest())
+            ripe = ripeHasher.digest()
+
+            with shared.printLock:
+                print 'within recpubkey, addressVersion:', addressVersion, ', streamNumber:', streamNumber
+                print 'ripe', ripe.encode('hex')
+                print 'publicSigningKey in hex:', publicSigningKey.encode('hex')
+                print 'publicEncryptionKey in hex:', publicEncryptionKey.encode('hex')
+
+
+            t = (ripe,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''SELECT usedpersonally FROM pubkeys WHERE hash=? AND usedpersonally='yes' ''')
+            shared.sqlSubmitQueue.put(t)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            if queryreturn != []:  # if this pubkey is already in our database and if we have used it personally:
+                print 'We HAVE used this pubkey personally. Updating time.'
+                t = (ripe, data, embeddedTime, 'yes')
+            else:
+                print 'We have NOT used this pubkey personally. Inserting in database.'
+                t = (ripe, data, embeddedTime, 'no')
+                     # This will also update the embeddedTime.
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
+            shared.sqlSubmitQueue.put(t)
+            shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            shared.sqlLock.release()
+            # shared.workerQueue.put(('newpubkey',(addressVersion,streamNumber,ripe)))
+            self.possibleNewPubkey(ripe)
+        if addressVersion == 3:
+            if len(data) < 170:  # sanity check.
+                print '(within processpubkey) payloadLength less than 170. Sanity check failed.'
+                return
+            bitfieldBehaviors = data[readPosition:readPosition + 4]
+            readPosition += 4
+            publicSigningKey = '\x04' + data[readPosition:readPosition + 64]
+            # Is it possible for a public key to be invalid such that trying to
+            # encrypt or sign with it will cause an error? If it is, we should
+            # probably test these keys here.
+            readPosition += 64
+            publicEncryptionKey = '\x04' + data[readPosition:readPosition + 64]
+            readPosition += 64
+            specifiedNonceTrialsPerByte, specifiedNonceTrialsPerByteLength = decodeVarint(
+                data[readPosition:readPosition + 10])
+            readPosition += specifiedNonceTrialsPerByteLength
+            specifiedPayloadLengthExtraBytes, specifiedPayloadLengthExtraBytesLength = decodeVarint(
+                data[readPosition:readPosition + 10])
+            readPosition += specifiedPayloadLengthExtraBytesLength
+            endOfSignedDataPosition = readPosition
+            signatureLength, signatureLengthLength = decodeVarint(
+                data[readPosition:readPosition + 10])
+            readPosition += signatureLengthLength
+            signature = data[readPosition:readPosition + signatureLength]
+            try:
+                if not highlevelcrypto.verify(data[8:endOfSignedDataPosition], signature, publicSigningKey.encode('hex')):
+                    print 'ECDSA verify failed (within processpubkey)'
+                    return
+                print 'ECDSA verify passed (within processpubkey)'
+            except Exception as err:
+                print 'ECDSA verify failed (within processpubkey)', err
+                return
+
+            sha = hashlib.new('sha512')
+            sha.update(publicSigningKey + publicEncryptionKey)
+            ripeHasher = hashlib.new('ripemd160')
+            ripeHasher.update(sha.digest())
+            ripe = ripeHasher.digest()
+
+            with shared.printLock:
+                print 'within recpubkey, addressVersion:', addressVersion, ', streamNumber:', streamNumber
+                print 'ripe', ripe.encode('hex')
+                print 'publicSigningKey in hex:', publicSigningKey.encode('hex')
+                print 'publicEncryptionKey in hex:', publicEncryptionKey.encode('hex')
+
+
+            t = (ripe,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''SELECT usedpersonally FROM pubkeys WHERE hash=? AND usedpersonally='yes' ''')
+            shared.sqlSubmitQueue.put(t)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            if queryreturn != []:  # if this pubkey is already in our database and if we have used it personally:
+                print 'We HAVE used this pubkey personally. Updating time.'
+                t = (ripe, data, embeddedTime, 'yes')
+            else:
+                print 'We have NOT used this pubkey personally. Inserting in database.'
+                t = (ripe, data, embeddedTime, 'no')
+                     # This will also update the embeddedTime.
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''INSERT INTO pubkeys VALUES (?,?,?,?)''')
+            shared.sqlSubmitQueue.put(t)
+            shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            shared.sqlLock.release()
+            # shared.workerQueue.put(('newpubkey',(addressVersion,streamNumber,ripe)))
+            self.possibleNewPubkey(ripe)
+
+    # We have received a getpubkey message
+    def recgetpubkey(self, data):
+        if not self.isProofOfWorkSufficient(data):
+            print 'Proof of work in getpubkey message insufficient.'
+            return
+        if len(data) < 34:
+            print 'getpubkey message doesn\'t contain enough data. Ignoring.'
+            return
+        readPosition = 8  # bypass the nonce
+        embeddedTime, = unpack('>I', data[readPosition:readPosition + 4])
+
+        # This section is used for the transition from 32 bit time to 64 bit
+        # time in the protocol.
+        if embeddedTime == 0:
+            embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8])
+            readPosition += 8
+        else:
+            readPosition += 4
+
+        if embeddedTime > int(time.time()) + 10800:
+            print 'The time in this getpubkey message is too new. Ignoring it. Time:', embeddedTime
+            return
+        if embeddedTime < int(time.time()) - shared.maximumAgeOfAnObjectThatIAmWillingToAccept:
+            print 'The time in this getpubkey message is too old. Ignoring it. Time:', embeddedTime
+            return
+        requestedAddressVersionNumber, addressVersionLength = decodeVarint(
+            data[readPosition:readPosition + 10])
+        readPosition += addressVersionLength
+        streamNumber, streamNumberLength = decodeVarint(
+            data[readPosition:readPosition + 10])
+        if streamNumber != self.streamNumber:
+            print 'The streamNumber', streamNumber, 'doesn\'t match our stream number:', self.streamNumber
+            return
+        readPosition += streamNumberLength
+
+        inventoryHash = calculateInventoryHash(data)
+        shared.inventoryLock.acquire()
+        if inventoryHash in shared.inventory:
+            print 'We have already received this getpubkey request. Ignoring it.'
+            shared.inventoryLock.release()
+            return
+        elif shared.isInSqlInventory(inventoryHash):
+            print 'We have already received this getpubkey request (it is stored on disk in the SQL inventory). Ignoring it.'
+            shared.inventoryLock.release()
+            return
+
+        objectType = 'getpubkey'
+        shared.inventory[inventoryHash] = (
+            objectType, self.streamNumber, data, embeddedTime)
+        shared.inventoryLock.release()
+        # This getpubkey request is valid so far. Forward to peers.
+        self.broadcastinv(inventoryHash)
+
+        if requestedAddressVersionNumber == 0:
+            print 'The requestedAddressVersionNumber of the pubkey request is zero. That doesn\'t make any sense. Ignoring it.'
+            return
+        elif requestedAddressVersionNumber == 1:
+            print 'The requestedAddressVersionNumber of the pubkey request is 1 which isn\'t supported anymore. Ignoring it.'
+            return
+        elif requestedAddressVersionNumber > 3:
+            print 'The requestedAddressVersionNumber of the pubkey request is too high. Can\'t understand. Ignoring it.'
+            return
+
+        requestedHash = data[readPosition:readPosition + 20]
+        if len(requestedHash) != 20:
+            print 'The length of the requested hash is not 20 bytes. Something is wrong. Ignoring.'
+            return
+        print 'the hash requested in this getpubkey request is:', requestedHash.encode('hex')
+
+        if requestedHash in shared.myAddressesByHash:  # if this address hash is one of mine
+            if decodeAddress(shared.myAddressesByHash[requestedHash])[1] != requestedAddressVersionNumber:
+                with shared.printLock:
+                    sys.stderr.write(
+                     '(Within the recgetpubkey function) Someone requested one of my pubkeys but the requestedAddressVersionNumber doesn\'t match my actual address version number. That shouldn\'t have happened. Ignoring.\n')
+
+                return
+            try:
+                lastPubkeySendTime = int(shared.config.get(
+                    shared.myAddressesByHash[requestedHash], 'lastpubkeysendtime'))
+            except:
+                lastPubkeySendTime = 0
+            if lastPubkeySendTime < time.time() - shared.lengthOfTimeToHoldOnToAllPubkeys:  # If the last time we sent our pubkey was at least 28 days ago...
+                with shared.printLock:
+                    print 'Found getpubkey-requested-hash in my list of EC hashes. Telling Worker thread to do the POW for a pubkey message and send it out.'
+
+                if requestedAddressVersionNumber == 2:
+                    shared.workerQueue.put((
+                        'doPOWForMyV2Pubkey', requestedHash))
+                elif requestedAddressVersionNumber == 3:
+                    shared.workerQueue.put((
+                        'doPOWForMyV3Pubkey', requestedHash))
+            else:
+                with shared.printLock:
+                    print 'Found getpubkey-requested-hash in my list of EC hashes BUT we already sent it recently. Ignoring request. The lastPubkeySendTime is:', lastPubkeySendTime
+
+        else:
+            with shared.printLock:
+                print 'This getpubkey request is not for any of my keys.'
+
+
+    # We have received an inv message
+    def recinv(self, data):
+        totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = 0  # ..from all peers, counting duplicates seperately (because they take up memory)
+        if len(shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer) > 0:
+            for key, value in shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer.items():
+                totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave += value
+            with shared.printLock:
+                print 'number of keys(hosts) in shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer:', len(shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer)
+                print 'totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = ', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave
+
+        numberOfItemsInInv, lengthOfVarint = decodeVarint(data[:10])
+        if numberOfItemsInInv > 50000:
+            sys.stderr.write('Too many items in inv message!')
+            return
+        if len(data) < lengthOfVarint + (numberOfItemsInInv * 32):
+            print 'inv message doesn\'t contain enough data. Ignoring.'
+            return
+        if numberOfItemsInInv == 1:  # we'll just request this data from the person who advertised the object.
+            if totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave > 200000 and len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 1000:  # inv flooding attack mitigation
+                with shared.printLock:
+                    print 'We already have', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 'items yet to retrieve from peers and over 1000 from this node in particular. Ignoring this inv message.'
+
+                return
+            self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware[
+                data[lengthOfVarint:32 + lengthOfVarint]] = 0
+            if data[lengthOfVarint:32 + lengthOfVarint] in shared.inventory:
+                with shared.printLock:
+                    print 'Inventory (in memory) has inventory item already.'
+
+            elif shared.isInSqlInventory(data[lengthOfVarint:32 + lengthOfVarint]):
+                print 'Inventory (SQL on disk) has inventory item already.'
+            else:
+                self.sendgetdata(data[lengthOfVarint:32 + lengthOfVarint])
+        else:
+            print 'inv message lists', numberOfItemsInInv, 'objects.'
+            for i in range(numberOfItemsInInv):  # upon finishing dealing with an incoming message, the receiveDataThread will request a random object from the peer. This way if we get multiple inv messages from multiple peers which list mostly the same objects, we will make getdata requests for different random objects from the various peers.
+                if len(data[lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]) == 32:  # The length of an inventory hash should be 32. If it isn't 32 then the remote node is either badly programmed or behaving nefariously.
+                    if totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave > 200000 and len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 1000:  # inv flooding attack mitigation
+                        with shared.printLock:
+                            print 'We already have', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 'items yet to retrieve from peers and over', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave), 'from this node in particular. Ignoring the rest of this inv message.'
+
+                        break
+                    self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware[data[
+                        lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]] = 0
+                    self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[
+                        data[lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]] = 0
+            shared.numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[
+                self.HOST] = len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)
+
+    # Send a getdata message to our peer to request the object with the given
+    # hash
+    def sendgetdata(self, hash):
+        with shared.printLock:
+            print 'sending getdata to retrieve object with hash:', hash.encode('hex')
+
+        payload = '\x01' + hash
+        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
+        headerData += 'getdata\x00\x00\x00\x00\x00'
+        headerData += pack('>L', len(
+            payload))  # payload length. Note that we add an extra 8 for the nonce.
+        headerData += hashlib.sha512(payload).digest()[:4]
+        try:
+            self.sock.sendall(headerData + payload)
+        except Exception as err:
+            # if not 'Bad file descriptor' in err:
+            with shared.printLock:
+                print 'sock.sendall error:', err
+
+
+    # We have received a getdata request from our peer
+    def recgetdata(self, data):
+        numberOfRequestedInventoryItems, lengthOfVarint = decodeVarint(
+            data[:10])
+        if len(data) < lengthOfVarint + (32 * numberOfRequestedInventoryItems):
+            print 'getdata message does not contain enough data. Ignoring.'
+            return
+        for i in xrange(numberOfRequestedInventoryItems):
+            hash = data[lengthOfVarint + (
+                i * 32):32 + lengthOfVarint + (i * 32)]
+            with shared.printLock:
+                print 'received getdata request for item:', hash.encode('hex')
+
+            # print 'inventory is', shared.inventory
+            if hash in shared.inventory:
+                objectType, streamNumber, payload, receivedTime = shared.inventory[
+                    hash]
+                self.sendData(objectType, payload)
+            else:
+                t = (hash,)
+                shared.sqlLock.acquire()
+                shared.sqlSubmitQueue.put(
+                    '''select objecttype, payload from inventory where hash=?''')
+                shared.sqlSubmitQueue.put(t)
+                queryreturn = shared.sqlReturnQueue.get()
+                shared.sqlLock.release()
+                if queryreturn != []:
+                    for row in queryreturn:
+                        objectType, payload = row
+                    self.sendData(objectType, payload)
+                else:
+                    print 'Someone asked for an object with a getdata which is not in either our memory inventory or our SQL inventory. That shouldn\'t have happened.'
+
+    # Our peer has requested (in a getdata message) that we send an object.
+    def sendData(self, objectType, payload):
+        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
+        if objectType == 'pubkey':
+            with shared.printLock:
+                print 'sending pubkey'
+
+            headerData += 'pubkey\x00\x00\x00\x00\x00\x00'
+        elif objectType == 'getpubkey' or objectType == 'pubkeyrequest':
+            with shared.printLock:
+                print 'sending getpubkey'
+
+            headerData += 'getpubkey\x00\x00\x00'
+        elif objectType == 'msg':
+            with shared.printLock:
+                print 'sending msg'
+
+            headerData += 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+        elif objectType == 'broadcast':
+            with shared.printLock:
+                print 'sending broadcast'
+
+            headerData += 'broadcast\x00\x00\x00'
+        else:
+            sys.stderr.write(
+                'Error: sendData has been asked to send a strange objectType: %s\n' % str(objectType))
+            return
+        headerData += pack('>L', len(payload))  # payload length.
+        headerData += hashlib.sha512(payload).digest()[:4]
+        try:
+            self.sock.sendall(headerData + payload)
+        except Exception as err:
+            # if not 'Bad file descriptor' in err:
+            with shared.printLock:
+                print 'sock.sendall error:', err
+
+
+    # Send an inv message with just one hash to all of our peers
+    def broadcastinv(self, hash):
+        with shared.printLock:
+            print 'broadcasting inv with hash:', hash.encode('hex')
+
+        shared.broadcastToSendDataQueues((self.streamNumber, 'sendinv', hash))
+
+    # We have received an addr message.
+    def recaddr(self, data):
+        listOfAddressDetailsToBroadcastToPeers = []
+        numberOfAddressesIncluded = 0
+        numberOfAddressesIncluded, lengthOfNumberOfAddresses = decodeVarint(
+            data[:10])
+
+        if shared.verbose >= 1:
+            with shared.printLock:
+                print 'addr message contains', numberOfAddressesIncluded, 'IP addresses.'
+
+
+        if self.remoteProtocolVersion == 1:
+            if numberOfAddressesIncluded > 1000 or numberOfAddressesIncluded == 0:
+                return
+            if len(data) != lengthOfNumberOfAddresses + (34 * numberOfAddressesIncluded):
+                print 'addr message does not contain the correct amount of data. Ignoring.'
+                return
+
+            needToWriteKnownNodesToDisk = False
+            for i in range(0, numberOfAddressesIncluded):
+                try:
+                    if data[16 + lengthOfNumberOfAddresses + (34 * i):28 + lengthOfNumberOfAddresses + (34 * i)] != '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF':
+                        with shared.printLock:
+                            print 'Skipping IPv6 address.', repr(data[16 + lengthOfNumberOfAddresses + (34 * i):28 + lengthOfNumberOfAddresses + (34 * i)])
+
+                        continue
+                except Exception as err:
+                    with shared.printLock:
+                        sys.stderr.write(
+                         'ERROR TRYING TO UNPACK recaddr (to test for an IPv6 address). Message: %s\n' % str(err))
+
+                    break  # giving up on unpacking any more. We should still be connected however.
+
+                try:
+                    recaddrStream, = unpack('>I', data[4 + lengthOfNumberOfAddresses + (
+                        34 * i):8 + lengthOfNumberOfAddresses + (34 * i)])
+                except Exception as err:
+                    with shared.printLock:
+                        sys.stderr.write(
+                          'ERROR TRYING TO UNPACK recaddr (recaddrStream). Message: %s\n' % str(err))
+
+                    break  # giving up on unpacking any more. We should still be connected however.
+                if recaddrStream == 0:
+                    continue
+                if recaddrStream != self.streamNumber and recaddrStream != (self.streamNumber * 2) and recaddrStream != ((self.streamNumber * 2) + 1):  # if the embedded stream number is not in my stream or either of my child streams then ignore it. Someone might be trying funny business.
+                    continue
+                try:
+                    recaddrServices, = unpack('>Q', data[8 + lengthOfNumberOfAddresses + (
+                        34 * i):16 + lengthOfNumberOfAddresses + (34 * i)])
+                except Exception as err:
+                    with shared.printLock:
+                        sys.stderr.write(
+                            'ERROR TRYING TO UNPACK recaddr (recaddrServices). Message: %s\n' % str(err))
+
+                    break  # giving up on unpacking any more. We should still be connected however.
+
+                try:
+                    recaddrPort, = unpack('>H', data[32 + lengthOfNumberOfAddresses + (
+                        34 * i):34 + lengthOfNumberOfAddresses + (34 * i)])
+                except Exception as err:
+                    with shared.printLock:
+                        sys.stderr.write(
+                            'ERROR TRYING TO UNPACK recaddr (recaddrPort). Message: %s\n' % str(err))
+
+                    break  # giving up on unpacking any more. We should still be connected however.
+                # print 'Within recaddr(): IP', recaddrIP, ', Port',
+                # recaddrPort, ', i', i
+                hostFromAddrMessage = socket.inet_ntoa(data[
+                                                       28 + lengthOfNumberOfAddresses + (34 * i):32 + lengthOfNumberOfAddresses + (34 * i)])
+                # print 'hostFromAddrMessage', hostFromAddrMessage
+                if data[28 + lengthOfNumberOfAddresses + (34 * i)] == '\x7F':
+                    print 'Ignoring IP address in loopback range:', hostFromAddrMessage
+                    continue
+                if helper_generic.isHostInPrivateIPRange(hostFromAddrMessage):
+                    print 'Ignoring IP address in private range:', hostFromAddrMessage
+                    continue
+                timeSomeoneElseReceivedMessageFromThisNode, = unpack('>I', data[lengthOfNumberOfAddresses + (
+                    34 * i):4 + lengthOfNumberOfAddresses + (34 * i)])  # This is the 'time' value in the received addr message.
+                if recaddrStream not in shared.knownNodes:  # knownNodes is a dictionary of dictionaries with one outer dictionary for each stream. If the outer stream dictionary doesn't exist yet then we must make it.
+                    shared.knownNodesLock.acquire()
+                    shared.knownNodes[recaddrStream] = {}
+                    shared.knownNodesLock.release()
+                if hostFromAddrMessage not in shared.knownNodes[recaddrStream]:
+                    if len(shared.knownNodes[recaddrStream]) < 20000 and timeSomeoneElseReceivedMessageFromThisNode > (int(time.time()) - 10800) and timeSomeoneElseReceivedMessageFromThisNode < (int(time.time()) + 10800):  # If we have more than 20000 nodes in our list already then just forget about adding more. Also, make sure that the time that someone else received a message from this node is within three hours from now.
+                        shared.knownNodesLock.acquire()
+                        shared.knownNodes[recaddrStream][hostFromAddrMessage] = (
+                            recaddrPort, timeSomeoneElseReceivedMessageFromThisNode)
+                        shared.knownNodesLock.release()
+                        needToWriteKnownNodesToDisk = True
+                        hostDetails = (
+                            timeSomeoneElseReceivedMessageFromThisNode,
+                            recaddrStream, recaddrServices, hostFromAddrMessage, recaddrPort)
+                        listOfAddressDetailsToBroadcastToPeers.append(
+                            hostDetails)
+                else:
+                    PORT, timeLastReceivedMessageFromThisNode = shared.knownNodes[recaddrStream][
+                        hostFromAddrMessage]  # PORT in this case is either the port we used to connect to the remote node, or the port that was specified by someone else in a past addr message.
+                    if (timeLastReceivedMessageFromThisNode < timeSomeoneElseReceivedMessageFromThisNode) and (timeSomeoneElseReceivedMessageFromThisNode < int(time.time())):
+                        shared.knownNodesLock.acquire()
+                        shared.knownNodes[recaddrStream][hostFromAddrMessage] = (
+                            PORT, timeSomeoneElseReceivedMessageFromThisNode)
+                        shared.knownNodesLock.release()
+                        if PORT != recaddrPort:
+                            print 'Strange occurance: The port specified in an addr message', str(recaddrPort), 'does not match the port', str(PORT), 'that this program (or some other peer) used to connect to it', str(hostFromAddrMessage), '. Perhaps they changed their port or are using a strange NAT configuration.'
+            if needToWriteKnownNodesToDisk:  # Runs if any nodes were new to us. Also, share those nodes with our peers.
+                shared.knownNodesLock.acquire()
+                output = open(shared.appdata + 'knownnodes.dat', 'wb')
+                pickle.dump(shared.knownNodes, output)
+                output.close()
+                shared.knownNodesLock.release()
+                self.broadcastaddr(
+                    listOfAddressDetailsToBroadcastToPeers)  # no longer broadcast
+            with shared.printLock:
+                print 'knownNodes currently has', len(shared.knownNodes[self.streamNumber]), 'nodes for this stream.'
+
+        elif self.remoteProtocolVersion >= 2:  # The difference is that in protocol version 2, network addresses use 64 bit times rather than 32 bit times.
+            if numberOfAddressesIncluded > 1000 or numberOfAddressesIncluded == 0:
+                return
+            if len(data) != lengthOfNumberOfAddresses + (38 * numberOfAddressesIncluded):
+                print 'addr message does not contain the correct amount of data. Ignoring.'
+                return
+
+            needToWriteKnownNodesToDisk = False
+            for i in range(0, numberOfAddressesIncluded):
+                try:
+                    if data[20 + lengthOfNumberOfAddresses + (38 * i):32 + lengthOfNumberOfAddresses + (38 * i)] != '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF':
+                        with shared.printLock:
+                           print 'Skipping IPv6 address.', repr(data[20 + lengthOfNumberOfAddresses + (38 * i):32 + lengthOfNumberOfAddresses + (38 * i)])
+
+                        continue
+                except Exception as err:
+                    with shared.printLock:
+                       sys.stderr.write(
+                           'ERROR TRYING TO UNPACK recaddr (to test for an IPv6 address). Message: %s\n' % str(err))
+
+                    break  # giving up on unpacking any more. We should still be connected however.
+
+                try:
+                    recaddrStream, = unpack('>I', data[8 + lengthOfNumberOfAddresses + (
+                        38 * i):12 + lengthOfNumberOfAddresses + (38 * i)])
+                except Exception as err:
+                    with shared.printLock:
+                       sys.stderr.write(
+                           'ERROR TRYING TO UNPACK recaddr (recaddrStream). Message: %s\n' % str(err))
+
+                    break  # giving up on unpacking any more. We should still be connected however.
+                if recaddrStream == 0:
+                    continue
+                if recaddrStream != self.streamNumber and recaddrStream != (self.streamNumber * 2) and recaddrStream != ((self.streamNumber * 2) + 1):  # if the embedded stream number is not in my stream or either of my child streams then ignore it. Someone might be trying funny business.
+                    continue
+                try:
+                    recaddrServices, = unpack('>Q', data[12 + lengthOfNumberOfAddresses + (
+                        38 * i):20 + lengthOfNumberOfAddresses + (38 * i)])
+                except Exception as err:
+                    with shared.printLock:
+                       sys.stderr.write(
+                            'ERROR TRYING TO UNPACK recaddr (recaddrServices). Message: %s\n' % str(err))
+
+                    break  # giving up on unpacking any more. We should still be connected however.
+
+                try:
+                    recaddrPort, = unpack('>H', data[36 + lengthOfNumberOfAddresses + (
+                        38 * i):38 + lengthOfNumberOfAddresses + (38 * i)])
+                except Exception as err:
+                    with shared.printLock:
+                        sys.stderr.write(
+                            'ERROR TRYING TO UNPACK recaddr (recaddrPort). Message: %s\n' % str(err))
+
+                    break  # giving up on unpacking any more. We should still be connected however.
+                # print 'Within recaddr(): IP', recaddrIP, ', Port',
+                # recaddrPort, ', i', i
+                hostFromAddrMessage = socket.inet_ntoa(data[
+                                                       32 + lengthOfNumberOfAddresses + (38 * i):36 + lengthOfNumberOfAddresses + (38 * i)])
+                # print 'hostFromAddrMessage', hostFromAddrMessage
+                if data[32 + lengthOfNumberOfAddresses + (38 * i)] == '\x7F':
+                    print 'Ignoring IP address in loopback range:', hostFromAddrMessage
+                    continue
+                if data[32 + lengthOfNumberOfAddresses + (38 * i)] == '\x0A':
+                    print 'Ignoring IP address in private range:', hostFromAddrMessage
+                    continue
+                if data[32 + lengthOfNumberOfAddresses + (38 * i):34 + lengthOfNumberOfAddresses + (38 * i)] == '\xC0A8':
+                    print 'Ignoring IP address in private range:', hostFromAddrMessage
+                    continue
+                timeSomeoneElseReceivedMessageFromThisNode, = unpack('>Q', data[lengthOfNumberOfAddresses + (
+                    38 * i):8 + lengthOfNumberOfAddresses + (38 * i)])  # This is the 'time' value in the received addr message. 64-bit.
+                if recaddrStream not in shared.knownNodes:  # knownNodes is a dictionary of dictionaries with one outer dictionary for each stream. If the outer stream dictionary doesn't exist yet then we must make it.
+                    shared.knownNodesLock.acquire()
+                    shared.knownNodes[recaddrStream] = {}
+                    shared.knownNodesLock.release()
+                if hostFromAddrMessage not in shared.knownNodes[recaddrStream]:
+                    if len(shared.knownNodes[recaddrStream]) < 20000 and timeSomeoneElseReceivedMessageFromThisNode > (int(time.time()) - 10800) and timeSomeoneElseReceivedMessageFromThisNode < (int(time.time()) + 10800):  # If we have more than 20000 nodes in our list already then just forget about adding more. Also, make sure that the time that someone else received a message from this node is within three hours from now.
+                        shared.knownNodesLock.acquire()
+                        shared.knownNodes[recaddrStream][hostFromAddrMessage] = (
+                            recaddrPort, timeSomeoneElseReceivedMessageFromThisNode)
+                        shared.knownNodesLock.release()
+                        with shared.printLock:
+                            print 'added new node', hostFromAddrMessage, 'to knownNodes in stream', recaddrStream
+
+                        needToWriteKnownNodesToDisk = True
+                        hostDetails = (
+                            timeSomeoneElseReceivedMessageFromThisNode,
+                            recaddrStream, recaddrServices, hostFromAddrMessage, recaddrPort)
+                        listOfAddressDetailsToBroadcastToPeers.append(
+                            hostDetails)
+                else:
+                    PORT, timeLastReceivedMessageFromThisNode = shared.knownNodes[recaddrStream][
+                        hostFromAddrMessage]  # PORT in this case is either the port we used to connect to the remote node, or the port that was specified by someone else in a past addr message.
+                    if (timeLastReceivedMessageFromThisNode < timeSomeoneElseReceivedMessageFromThisNode) and (timeSomeoneElseReceivedMessageFromThisNode < int(time.time())):
+                        shared.knownNodesLock.acquire()
+                        shared.knownNodes[recaddrStream][hostFromAddrMessage] = (
+                            PORT, timeSomeoneElseReceivedMessageFromThisNode)
+                        shared.knownNodesLock.release()
+                        if PORT != recaddrPort:
+                            print 'Strange occurance: The port specified in an addr message', str(recaddrPort), 'does not match the port', str(PORT), 'that this program (or some other peer) used to connect to it', str(hostFromAddrMessage), '. Perhaps they changed their port or are using a strange NAT configuration.'
+            if needToWriteKnownNodesToDisk:  # Runs if any nodes were new to us. Also, share those nodes with our peers.
+                shared.knownNodesLock.acquire()
+                output = open(shared.appdata + 'knownnodes.dat', 'wb')
+                pickle.dump(shared.knownNodes, output)
+                output.close()
+                shared.knownNodesLock.release()
+                self.broadcastaddr(listOfAddressDetailsToBroadcastToPeers)
+            with shared.printLock:
+                print 'knownNodes currently has', len(shared.knownNodes[self.streamNumber]), 'nodes for this stream.'
+
+
+    # Function runs when we want to broadcast an addr message to all of our
+    # peers. Runs when we learn of nodes that we didn't previously know about
+    # and want to share them with our peers.
+    def broadcastaddr(self, listOfAddressDetailsToBroadcastToPeers):
+        numberOfAddressesInAddrMessage = len(
+            listOfAddressDetailsToBroadcastToPeers)
+        payload = ''
+        for hostDetails in listOfAddressDetailsToBroadcastToPeers:
+            timeLastReceivedMessageFromThisNode, streamNumber, services, host, port = hostDetails
+            payload += pack(
+                '>Q', timeLastReceivedMessageFromThisNode)  # now uses 64-bit time
+            payload += pack('>I', streamNumber)
+            payload += pack(
+                '>q', services)  # service bit flags offered by this node
+            payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
+                socket.inet_aton(host)
+            payload += pack('>H', port)  # remote port
+
+        payload = encodeVarint(numberOfAddressesInAddrMessage) + payload
+        datatosend = '\xE9\xBE\xB4\xD9addr\x00\x00\x00\x00\x00\x00\x00\x00'
+        datatosend = datatosend + pack('>L', len(payload))  # payload length
+        datatosend = datatosend + hashlib.sha512(payload).digest()[0:4]
+        datatosend = datatosend + payload
+
+        if shared.verbose >= 1:
+            with shared.printLock:
+                print 'Broadcasting addr with', numberOfAddressesInAddrMessage, 'entries.'
+
+        shared.broadcastToSendDataQueues((
+            self.streamNumber, 'sendaddr', datatosend))
+
+    # Send a big addr message to our peer
+    def sendaddr(self):
+        addrsInMyStream = {}
+        addrsInChildStreamLeft = {}
+        addrsInChildStreamRight = {}
+        # print 'knownNodes', shared.knownNodes
+
+        # We are going to share a maximum number of 1000 addrs with our peer.
+        # 500 from this stream, 250 from the left child stream, and 250 from
+        # the right child stream.
+        shared.knownNodesLock.acquire()
+        if len(shared.knownNodes[self.streamNumber]) > 0:
+            for i in range(500):
+                random.seed()
+                HOST, = random.sample(shared.knownNodes[self.streamNumber], 1)
+                if helper_generic.isHostInPrivateIPRange(HOST):
+                    continue
+                addrsInMyStream[HOST] = shared.knownNodes[
+                    self.streamNumber][HOST]
+        if len(shared.knownNodes[self.streamNumber * 2]) > 0:
+            for i in range(250):
+                random.seed()
+                HOST, = random.sample(shared.knownNodes[
+                                      self.streamNumber * 2], 1)
+                if helper_generic.isHostInPrivateIPRange(HOST):
+                    continue
+                addrsInChildStreamLeft[HOST] = shared.knownNodes[
+                    self.streamNumber * 2][HOST]
+        if len(shared.knownNodes[(self.streamNumber * 2) + 1]) > 0:
+            for i in range(250):
+                random.seed()
+                HOST, = random.sample(shared.knownNodes[
+                                      (self.streamNumber * 2) + 1], 1)
+                if helper_generic.isHostInPrivateIPRange(HOST):
+                    continue
+                addrsInChildStreamRight[HOST] = shared.knownNodes[
+                    (self.streamNumber * 2) + 1][HOST]
+        shared.knownNodesLock.release()
+        numberOfAddressesInAddrMessage = 0
+        payload = ''
+        # print 'addrsInMyStream.items()', addrsInMyStream.items()
+        for HOST, value in addrsInMyStream.items():
+            PORT, timeLastReceivedMessageFromThisNode = value
+            if timeLastReceivedMessageFromThisNode > (int(time.time()) - shared.maximumAgeOfNodesThatIAdvertiseToOthers):  # If it is younger than 3 hours old..
+                numberOfAddressesInAddrMessage += 1
+                payload += pack(
+                    '>Q', timeLastReceivedMessageFromThisNode)  # 64-bit time
+                payload += pack('>I', self.streamNumber)
+                payload += pack(
+                    '>q', 1)  # service bit flags offered by this node
+                payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
+                    socket.inet_aton(HOST)
+                payload += pack('>H', PORT)  # remote port
+        for HOST, value in addrsInChildStreamLeft.items():
+            PORT, timeLastReceivedMessageFromThisNode = value
+            if timeLastReceivedMessageFromThisNode > (int(time.time()) - shared.maximumAgeOfNodesThatIAdvertiseToOthers):  # If it is younger than 3 hours old..
+                numberOfAddressesInAddrMessage += 1
+                payload += pack(
+                    '>Q', timeLastReceivedMessageFromThisNode)  # 64-bit time
+                payload += pack('>I', self.streamNumber * 2)
+                payload += pack(
+                    '>q', 1)  # service bit flags offered by this node
+                payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
+                    socket.inet_aton(HOST)
+                payload += pack('>H', PORT)  # remote port
+        for HOST, value in addrsInChildStreamRight.items():
+            PORT, timeLastReceivedMessageFromThisNode = value
+            if timeLastReceivedMessageFromThisNode > (int(time.time()) - shared.maximumAgeOfNodesThatIAdvertiseToOthers):  # If it is younger than 3 hours old..
+                numberOfAddressesInAddrMessage += 1
+                payload += pack(
+                    '>Q', timeLastReceivedMessageFromThisNode)  # 64-bit time
+                payload += pack('>I', (self.streamNumber * 2) + 1)
+                payload += pack(
+                    '>q', 1)  # service bit flags offered by this node
+                payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
+                    socket.inet_aton(HOST)
+                payload += pack('>H', PORT)  # remote port
+
+        payload = encodeVarint(numberOfAddressesInAddrMessage) + payload
+        datatosend = '\xE9\xBE\xB4\xD9addr\x00\x00\x00\x00\x00\x00\x00\x00'
+        datatosend = datatosend + pack('>L', len(payload))  # payload length
+        datatosend = datatosend + hashlib.sha512(payload).digest()[0:4]
+        datatosend = datatosend + payload
+        try:
+            self.sock.sendall(datatosend)
+            if shared.verbose >= 1:
+                with shared.printLock:
+                    print 'Sending addr with', numberOfAddressesInAddrMessage, 'entries.'
+
+        except Exception as err:
+            # if not 'Bad file descriptor' in err:
+            with shared.printLock:
+                print 'sock.sendall error:', err
+
+
+    # We have received a version message
+    def recversion(self, data):
+        if len(data) < 83:
+            # This version message is unreasonably short. Forget it.
+            return
+        elif not self.verackSent:
+            self.remoteProtocolVersion, = unpack('>L', data[:4])
+            if self.remoteProtocolVersion <= 1:
+                shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
+                with shared.printLock:
+                    print 'Closing connection to old protocol version 1 node: ', self.HOST
+
+                return
+            # print 'remoteProtocolVersion', self.remoteProtocolVersion
+            self.myExternalIP = socket.inet_ntoa(data[40:44])
+            # print 'myExternalIP', self.myExternalIP
+            self.remoteNodeIncomingPort, = unpack('>H', data[70:72])
+            # print 'remoteNodeIncomingPort', self.remoteNodeIncomingPort
+            useragentLength, lengthOfUseragentVarint = decodeVarint(
+                data[80:84])
+            readPosition = 80 + lengthOfUseragentVarint
+            useragent = data[readPosition:readPosition + useragentLength]
+            readPosition += useragentLength
+            numberOfStreamsInVersionMessage, lengthOfNumberOfStreamsInVersionMessage = decodeVarint(
+                data[readPosition:])
+            readPosition += lengthOfNumberOfStreamsInVersionMessage
+            self.streamNumber, lengthOfRemoteStreamNumber = decodeVarint(
+                data[readPosition:])
+            with shared.printLock:
+                print 'Remote node useragent:', useragent, '  stream number:', self.streamNumber
+
+            if self.streamNumber != 1:
+                shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
+                with shared.printLock:
+                    print 'Closed connection to', self.HOST, 'because they are interested in stream', self.streamNumber, '.'
+
+                return
+            shared.connectedHostsList[
+                self.HOST] = 1  # We use this data structure to not only keep track of what hosts we are connected to so that we don't try to connect to them again, but also to list the connections count on the Network Status tab.
+            # If this was an incoming connection, then the sendData thread
+            # doesn't know the stream. We have to set it.
+            if not self.initiatedConnection:
+                shared.broadcastToSendDataQueues((
+                    0, 'setStreamNumber', (self.HOST, self.streamNumber)))
+            if data[72:80] == shared.eightBytesOfRandomDataUsedToDetectConnectionsToSelf:
+                shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST))
+                with shared.printLock:
+                    print 'Closing connection to myself: ', self.HOST
+
+                return
+            shared.broadcastToSendDataQueues((0, 'setRemoteProtocolVersion', (
+                self.HOST, self.remoteProtocolVersion)))
+
+            shared.knownNodesLock.acquire()
+            shared.knownNodes[self.streamNumber][self.HOST] = (
+                self.remoteNodeIncomingPort, int(time.time()))
+            output = open(shared.appdata + 'knownnodes.dat', 'wb')
+            pickle.dump(shared.knownNodes, output)
+            output.close()
+            shared.knownNodesLock.release()
+
+            self.sendverack()
+            if self.initiatedConnection == False:
+                self.sendversion()
+
+    # Sends a version message
+    def sendversion(self):
+        with shared.printLock:
+            print 'Sending version message'
+
+        try:
+            self.sock.sendall(shared.assembleVersionMessage(
+                self.HOST, self.PORT, self.streamNumber))
+        except Exception as err:
+            # if not 'Bad file descriptor' in err:
+            with shared.printLock:
+                print 'sock.sendall error:', err
+
+
+    # Sends a verack message
+    def sendverack(self):
+        with shared.printLock:
+            print 'Sending verack'
+
+        try:
+            self.sock.sendall(
+                '\xE9\xBE\xB4\xD9\x76\x65\x72\x61\x63\x6B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35')
+        except Exception as err:
+            # if not 'Bad file descriptor' in err:
+            with shared.printLock:
+                print 'sock.sendall error:', err
+
+                                                                                                             # cf
+                                                                                                             # 83
+                                                                                                             # e1
+                                                                                                             # 35
+        self.verackSent = True
+        if self.verackReceived:
+            self.connectionFullyEstablished()

src/class_sendDataThread.py

@@ -0,0 +1,174 @@
+import time
+import threading
+import shared
+import Queue
+from struct import unpack, pack
+import hashlib
+import random
+import sys
+import socket
+
+#import bitmessagemain
+
+# Every connection to a peer has a sendDataThread (and also a
+# receiveDataThread).
+class sendDataThread(threading.Thread):
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+        self.mailbox = Queue.Queue()
+        shared.sendDataQueues.append(self.mailbox)
+        with shared.printLock:
+            print 'The length of sendDataQueues at sendDataThread init is:', len(shared.sendDataQueues)
+
+        self.data = ''
+
+    def setup(
+        self,
+        sock,
+        HOST,
+        PORT,
+        streamNumber,
+            someObjectsOfWhichThisRemoteNodeIsAlreadyAware):
+        self.sock = sock
+        self.HOST = HOST
+        self.PORT = PORT
+        self.streamNumber = streamNumber
+        self.remoteProtocolVersion = - \
+            1  # This must be set using setRemoteProtocolVersion command which is sent through the self.mailbox queue.
+        self.lastTimeISentData = int(
+            time.time())  # If this value increases beyond five minutes ago, we'll send a pong message to keep the connection alive.
+        self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware = someObjectsOfWhichThisRemoteNodeIsAlreadyAware
+        with shared.printLock:
+            print 'The streamNumber of this sendDataThread (ID:', str(id(self)) + ') at setup() is', self.streamNumber
+
+
+    def sendVersionMessage(self):
+        datatosend = shared.assembleVersionMessage(
+            self.HOST, self.PORT, self.streamNumber)  # the IP and port of the remote host, and my streamNumber.
+
+        with shared.printLock:
+            print 'Sending version packet: ', repr(datatosend)
+
+        try:
+            self.sock.sendall(datatosend)
+        except Exception as err:
+            # if not 'Bad file descriptor' in err:
+            with shared.printLock:
+                sys.stderr.write('sock.sendall error: %s\n' % err)
+            
+        self.versionSent = 1
+
+    def run(self):
+        while True:
+            deststream, command, data = self.mailbox.get()
+            # with shared.printLock:
+            #   print 'sendDataThread, destream:', deststream, ', Command:', command, ', ID:',id(self), ', HOST:', self.HOST
+            #
+
+            if deststream == self.streamNumber or deststream == 0:
+                if command == 'shutdown':
+                    if data == self.HOST or data == 'all':
+                        with shared.printLock:
+                            print 'sendDataThread (associated with', self.HOST, ') ID:', id(self), 'shutting down now.'
+
+                        try:
+                            self.sock.shutdown(socket.SHUT_RDWR)
+                            self.sock.close()
+                        except:
+                            pass
+                        shared.sendDataQueues.remove(self.mailbox)
+                        with shared.printLock:
+                            print 'len of sendDataQueues', len(shared.sendDataQueues)
+
+                        break
+                # When you receive an incoming connection, a sendDataThread is
+                # created even though you don't yet know what stream number the
+                # remote peer is interested in. They will tell you in a version
+                # message and if you too are interested in that stream then you
+                # will continue on with the connection and will set the
+                # streamNumber of this send data thread here:
+                elif command == 'setStreamNumber':
+                    hostInMessage, specifiedStreamNumber = data
+                    if hostInMessage == self.HOST:
+                        with shared.printLock:
+                            print 'setting the stream number in the sendData thread (ID:', id(self), ') to', specifiedStreamNumber
+
+                        self.streamNumber = specifiedStreamNumber
+                elif command == 'setRemoteProtocolVersion':
+                    hostInMessage, specifiedRemoteProtocolVersion = data
+                    if hostInMessage == self.HOST:
+                        with shared.printLock:
+                            print 'setting the remote node\'s protocol version in the sendData thread (ID:', id(self), ') to', specifiedRemoteProtocolVersion
+
+                        self.remoteProtocolVersion = specifiedRemoteProtocolVersion
+                elif command == 'sendaddr':
+                    try:
+                        # To prevent some network analysis, 'leak' the data out
+                        # to our peer after waiting a random amount of time
+                        # unless we have a long list of messages in our queue
+                        # to send.
+                        random.seed()
+                        time.sleep(random.randrange(0, 10))
+                        self.sock.sendall(data)
+                        self.lastTimeISentData = int(time.time())
+                    except:
+                        print 'self.sock.sendall failed'
+                        try:
+                            self.sock.shutdown(socket.SHUT_RDWR)
+                            self.sock.close()
+                        except:
+                            pass
+                        shared.sendDataQueues.remove(self.mailbox)
+                        print 'sendDataThread thread (ID:', str(id(self)) + ') ending now. Was connected to', self.HOST
+                        break
+                elif command == 'sendinv':
+                    if data not in self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware:
+                        payload = '\x01' + data
+                        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
+                        headerData += 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+                        headerData += pack('>L', len(payload))
+                        headerData += hashlib.sha512(payload).digest()[:4]
+                        # To prevent some network analysis, 'leak' the data out
+                        # to our peer after waiting a random amount of time
+                        random.seed()
+                        time.sleep(random.randrange(0, 10))
+                        try:
+                            self.sock.sendall(headerData + payload)
+                            self.lastTimeISentData = int(time.time())
+                        except:
+                            print 'self.sock.sendall failed'
+                            try:
+                                self.sock.shutdown(socket.SHUT_RDWR)
+                                self.sock.close()
+                            except:
+                                pass
+                            shared.sendDataQueues.remove(self.mailbox)
+                            print 'sendDataThread thread (ID:', str(id(self)) + ') ending now. Was connected to', self.HOST
+                            break
+                elif command == 'pong':
+                    self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware.clear() # To save memory, let us clear this data structure from time to time. As its function is to help us keep from sending inv messages to peers which sent us the same inv message mere seconds earlier, it will be fine to clear this data structure from time to time.
+                    if self.lastTimeISentData < (int(time.time()) - 298):
+                        # Send out a pong message to keep the connection alive.
+                        with shared.printLock:
+                            print 'Sending pong to', self.HOST, 'to keep connection alive.'
+
+                        try:
+                            self.sock.sendall(
+                                '\xE9\xBE\xB4\xD9\x70\x6F\x6E\x67\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35')
+                            self.lastTimeISentData = int(time.time())
+                        except:
+                            print 'send pong failed'
+                            try:
+                                self.sock.shutdown(socket.SHUT_RDWR)
+                                self.sock.close()
+                            except:
+                                pass
+                            shared.sendDataQueues.remove(self.mailbox)
+                            print 'sendDataThread thread', self, 'ending now. Was connected to', self.HOST
+                            break
+            else:
+                with shared.printLock:
+                    print 'sendDataThread ID:', id(self), 'ignoring command', command, 'because the thread is not in stream', deststream
+
+

src/class_singleCleaner.py

@@ -0,0 +1,122 @@
+import threading
+import shared
+import time
+import sys
+
+'''The singleCleaner class is a timer-driven thread that cleans data structures to free memory, resends messages when a remote node doesn't respond, and sends pong messages to keep connections alive if the network isn't busy.
+It cleans these data structures in memory:
+    inventory (moves data to the on-disk sql database)
+
+It cleans these tables on the disk:
+    inventory (clears data more than 2 days and 12 hours old)
+    pubkeys (clears pubkeys older than 4 weeks old which we have not used personally)
+
+It resends messages when there has been no response:
+    resends getpubkey messages in 4 days (then 8 days, then 16 days, etc...)
+    resends msg messages in 4 days (then 8 days, then 16 days, etc...)
+
+'''
+
+
+class singleCleaner(threading.Thread):
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def run(self):
+        timeWeLastClearedInventoryAndPubkeysTables = 0
+
+        while True:
+            shared.sqlLock.acquire()
+            shared.UISignalQueue.put((
+                'updateStatusBar', 'Doing housekeeping (Flushing inventory in memory to disk...)'))
+            for hash, storedValue in shared.inventory.items():
+                objectType, streamNumber, payload, receivedTime = storedValue
+                if int(time.time()) - 3600 > receivedTime:
+                    t = (hash, objectType, streamNumber, payload, receivedTime)
+                    shared.sqlSubmitQueue.put(
+                        '''INSERT INTO inventory VALUES (?,?,?,?,?)''')
+                    shared.sqlSubmitQueue.put(t)
+                    shared.sqlReturnQueue.get()
+                    del shared.inventory[hash]
+            shared.sqlSubmitQueue.put('commit')
+            shared.UISignalQueue.put(('updateStatusBar', ''))
+            shared.sqlLock.release()
+            shared.broadcastToSendDataQueues((
+                0, 'pong', 'no data'))  # commands the sendData threads to send out a pong message if they haven't sent anything else in the last five minutes. The socket timeout-time is 10 minutes.
+            # If we are running as a daemon then we are going to fill up the UI
+            # queue which will never be handled by a UI. We should clear it to
+            # save memory.
+            if shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'):
+                shared.UISignalQueue.queue.clear()
+            if timeWeLastClearedInventoryAndPubkeysTables < int(time.time()) - 7380:
+                timeWeLastClearedInventoryAndPubkeysTables = int(time.time())
+                # inventory (moves data from the inventory data structure to
+                # the on-disk sql database)
+                shared.sqlLock.acquire()
+                # inventory (clears pubkeys after 28 days and everything else
+                # after 2 days and 12 hours)
+                t = (int(time.time()) - shared.lengthOfTimeToLeaveObjectsInInventory, int(
+                    time.time()) - shared.lengthOfTimeToHoldOnToAllPubkeys)
+                shared.sqlSubmitQueue.put(
+                    '''DELETE FROM inventory WHERE (receivedtime<? AND objecttype<>'pubkey') OR (receivedtime<?  AND objecttype='pubkey') ''')
+                shared.sqlSubmitQueue.put(t)
+                shared.sqlReturnQueue.get()
+
+                # pubkeys
+                t = (int(time.time()) - shared.lengthOfTimeToHoldOnToAllPubkeys,)
+                shared.sqlSubmitQueue.put(
+                    '''DELETE FROM pubkeys WHERE time<? AND usedpersonally='no' ''')
+                shared.sqlSubmitQueue.put(t)
+                shared.sqlReturnQueue.get()
+                shared.sqlSubmitQueue.put('commit')
+
+                t = ()
+                shared.sqlSubmitQueue.put(
+                    '''select toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber FROM sent WHERE ((status='awaitingpubkey' OR status='msgsent') AND folder='sent') ''')  # If the message's folder='trash' then we'll ignore it.
+                shared.sqlSubmitQueue.put(t)
+                queryreturn = shared.sqlReturnQueue.get()
+                for row in queryreturn:
+                    if len(row) < 5:
+                        with shared.printLock:
+                            sys.stderr.write(
+                                'Something went wrong in the singleCleaner thread: a query did not return the requested fields. ' + repr(row))
+                        time.sleep(3)
+
+                        break
+                    toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber = row
+                    if status == 'awaitingpubkey':
+                        if int(time.time()) - lastactiontime > (shared.maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (pubkeyretrynumber))):
+                            print 'It has been a long time and we haven\'t heard a response to our getpubkey request. Sending again.'
+                            try:
+                                del shared.neededPubkeys[
+                                    toripe]  # We need to take this entry out of the shared.neededPubkeys structure because the shared.workerQueue checks to see whether the entry is already present and will not do the POW and send the message because it assumes that it has already done it recently.
+                            except:
+                                pass
+
+                            shared.UISignalQueue.put((
+                                'updateStatusBar', 'Doing work necessary to again attempt to request a public key...'))
+                            t = (int(
+                                time.time()), pubkeyretrynumber + 1, toripe)
+                            shared.sqlSubmitQueue.put(
+                                '''UPDATE sent SET lastactiontime=?, pubkeyretrynumber=?, status='msgqueued' WHERE toripe=?''')
+                            shared.sqlSubmitQueue.put(t)
+                            shared.sqlReturnQueue.get()
+                            shared.sqlSubmitQueue.put('commit')
+                            shared.workerQueue.put(('sendmessage', ''))
+                    else:  # status == msgsent
+                        if int(time.time()) - lastactiontime > (shared.maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (msgretrynumber))):
+                            print 'It has been a long time and we haven\'t heard an acknowledgement to our msg. Sending again.'
+                            t = (int(
+                                time.time()), msgretrynumber + 1, 'msgqueued', ackdata)
+                            shared.sqlSubmitQueue.put(
+                                '''UPDATE sent SET lastactiontime=?, msgretrynumber=?, status=? WHERE ackdata=?''')
+                            shared.sqlSubmitQueue.put(t)
+                            shared.sqlReturnQueue.get()
+                            shared.sqlSubmitQueue.put('commit')
+                            shared.workerQueue.put(('sendmessage', ''))
+                            shared.UISignalQueue.put((
+                                'updateStatusBar', 'Doing work necessary to again attempt to deliver a message...'))
+                shared.sqlSubmitQueue.put('commit')
+                shared.sqlLock.release()
+            time.sleep(300)

src/class_singleListener.py

@@ -0,0 +1,81 @@
+import threading
+import shared
+import socket
+from class_sendDataThread import *
+from class_receiveDataThread import *
+
+# Only one singleListener thread will ever exist. It creates the
+# receiveDataThread and sendDataThread for each incoming connection. Note
+# that it cannot set the stream number because it is not known yet- the
+# other node will have to tell us its stream number in a version message.
+# If we don't care about their stream, we will close the connection
+# (within the recversion function of the recieveData thread)
+
+
+class singleListener(threading.Thread):
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def setup(self, selfInitiatedConnections):
+        self.selfInitiatedConnections = selfInitiatedConnections
+
+    def run(self):
+        # We don't want to accept incoming connections if the user is using a
+        # SOCKS proxy. If they eventually select proxy 'none' then this will
+        # start listening for connections.
+        while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS':
+            time.sleep(300)
+
+        with shared.printLock:
+            print 'Listening for incoming connections.'
+
+        HOST = ''  # Symbolic name meaning all available interfaces
+        PORT = shared.config.getint('bitmessagesettings', 'port')
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        # This option apparently avoids the TIME_WAIT state so that we can
+        # rebind faster
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        sock.bind((HOST, PORT))
+        sock.listen(2)
+
+        while True:
+            # We don't want to accept incoming connections if the user is using
+            # a SOCKS proxy. If the user eventually select proxy 'none' then
+            # this will start listening for connections.
+            while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS':
+                time.sleep(10)
+            while len(shared.connectedHostsList) > 220:
+                with shared.printLock:
+                    print 'We are connected to too many people. Not accepting further incoming connections for ten seconds.'
+
+                time.sleep(10)
+            a, (HOST, PORT) = sock.accept()
+
+            # The following code will, unfortunately, block an incoming
+            # connection if someone else on the same LAN is already connected
+            # because the two computers will share the same external IP. This
+            # is here to prevent connection flooding.
+            while HOST in shared.connectedHostsList:
+                with shared.printLock:
+                    print 'We are already connected to', HOST + '. Ignoring connection.'
+
+                a.close()
+                a, (HOST, PORT) = sock.accept()
+            someObjectsOfWhichThisRemoteNodeIsAlreadyAware = {} # This is not necessairly a complete list; we clear it from time to time to save memory.
+            a.settimeout(20)
+
+            sd = sendDataThread()
+            sd.setup(
+                a, HOST, PORT, -1, someObjectsOfWhichThisRemoteNodeIsAlreadyAware)
+            sd.start()
+
+            rd = receiveDataThread()
+            rd.daemon = True  # close the main program even if there are threads left
+            rd.setup(
+                a, HOST, PORT, -1, someObjectsOfWhichThisRemoteNodeIsAlreadyAware, self.selfInitiatedConnections)
+            rd.start()
+
+            with shared.printLock:
+                print self, 'connected to', HOST, 'during INCOMING request.'
+

src/class_singleWorker.py

@@ -0,0 +1,860 @@
+import threading
+import shared
+import time
+from time import strftime, localtime, gmtime
+import random
+from addresses import *
+import highlevelcrypto
+import proofofwork
+import sys
+from class_addressGenerator import pointMult
+import tr
+
+# This thread, of which there is only one, does the heavy lifting:
+# calculating POWs.
+
+
+class singleWorker(threading.Thread):
+
+    def __init__(self):
+        # QThread.__init__(self, parent)
+        threading.Thread.__init__(self)
+
+    def run(self):
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put(
+            '''SELECT toripe FROM sent WHERE ((status='awaitingpubkey' OR status='doingpubkeypow') AND folder='sent')''')
+        shared.sqlSubmitQueue.put('')
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        for row in queryreturn:
+            toripe, = row
+            shared.neededPubkeys[toripe] = 0
+
+        # Initialize the shared.ackdataForWhichImWatching data structure using data
+        # from the sql database.
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put(
+            '''SELECT ackdata FROM sent where (status='msgsent' OR status='doingmsgpow')''')
+        shared.sqlSubmitQueue.put('')
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        for row in queryreturn:
+            ackdata, = row
+            print 'Watching for ackdata', ackdata.encode('hex')
+            shared.ackdataForWhichImWatching[ackdata] = 0
+
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put(
+            '''SELECT DISTINCT toaddress FROM sent WHERE (status='doingpubkeypow' AND folder='sent')''')
+        shared.sqlSubmitQueue.put('')
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        for row in queryreturn:
+            toaddress, = row
+            self.requestPubKey(toaddress)
+
+        time.sleep(
+            10)  # give some time for the GUI to start before we start on existing POW tasks.
+
+        self.sendMsg()
+                     # just in case there are any pending tasks for msg
+                     # messages that have yet to be sent.
+        self.sendBroadcast()
+                           # just in case there are any tasks for Broadcasts
+                           # that have yet to be sent.
+
+        while True:
+            command, data = shared.workerQueue.get()
+            if command == 'sendmessage':
+                self.sendMsg()
+            elif command == 'sendbroadcast':
+                self.sendBroadcast()
+            elif command == 'doPOWForMyV2Pubkey':
+                self.doPOWForMyV2Pubkey(data)
+            elif command == 'doPOWForMyV3Pubkey':
+                self.doPOWForMyV3Pubkey(data)
+                """elif command == 'newpubkey':
+                    toAddressVersion,toStreamNumber,toRipe = data
+                    if toRipe in shared.neededPubkeys:
+                        print 'We have been awaiting the arrival of this pubkey.'
+                        del shared.neededPubkeys[toRipe]
+                        t = (toRipe,)
+                        shared.sqlLock.acquire()
+                        shared.sqlSubmitQueue.put('''UPDATE sent SET status='doingmsgpow' WHERE toripe=? AND status='awaitingpubkey' and folder='sent' ''')
+                        shared.sqlSubmitQueue.put(t)
+                        shared.sqlReturnQueue.get()
+                        shared.sqlSubmitQueue.put('commit')
+                        shared.sqlLock.release()
+                        self.sendMsg()
+                    else:
+                        with shared.printLock:
+                            print 'We don\'t need this pub key. We didn\'t ask for it. Pubkey hash:', toRipe.encode('hex')
+                        """
+            else:
+                with shared.printLock:
+                    sys.stderr.write(
+                        'Probable programming error: The command sent to the workerThread is weird. It is: %s\n' % command)
+
+            shared.workerQueue.task_done()
+
+    def doPOWForMyV2Pubkey(self, hash):  # This function also broadcasts out the pubkey message once it is done with the POW
+        # Look up my stream number based on my address hash
+        """configSections = shared.config.sections()
+        for addressInKeysFile in configSections:
+            if addressInKeysFile <> 'bitmessagesettings':
+                status,addressVersionNumber,streamNumber,hashFromThisParticularAddress = decodeAddress(addressInKeysFile)
+                if hash == hashFromThisParticularAddress:
+                    myAddress = addressInKeysFile
+                    break"""
+        myAddress = shared.myAddressesByHash[hash]
+        status, addressVersionNumber, streamNumber, hash = decodeAddress(
+            myAddress)
+        embeddedTime = int(time.time() + random.randrange(
+            -300, 300))  # the current time plus or minus five minutes
+        payload = pack('>I', (embeddedTime))
+        payload += encodeVarint(addressVersionNumber)  # Address version number
+        payload += encodeVarint(streamNumber)
+        payload += '\x00\x00\x00\x01'  # bitfield of features supported by me (see the wiki).
+
+        try:
+            privSigningKeyBase58 = shared.config.get(
+                myAddress, 'privsigningkey')
+            privEncryptionKeyBase58 = shared.config.get(
+                myAddress, 'privencryptionkey')
+        except Exception as err:
+            with shared.printLock:
+                sys.stderr.write(
+                    'Error within doPOWForMyV2Pubkey. Could not read the keys from the keys.dat file for a requested address. %s\n' % err)
+
+            return
+
+        privSigningKeyHex = shared.decodeWalletImportFormat(
+            privSigningKeyBase58).encode('hex')
+        privEncryptionKeyHex = shared.decodeWalletImportFormat(
+            privEncryptionKeyBase58).encode('hex')
+        pubSigningKey = highlevelcrypto.privToPub(
+            privSigningKeyHex).decode('hex')
+        pubEncryptionKey = highlevelcrypto.privToPub(
+            privEncryptionKeyHex).decode('hex')
+
+        payload += pubSigningKey[1:]
+        payload += pubEncryptionKey[1:]
+
+        # Do the POW for this pubkey message
+        target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes +
+                             8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
+        print '(For pubkey message) Doing proof of work...'
+        initialHash = hashlib.sha512(payload).digest()
+        trialValue, nonce = proofofwork.run(target, initialHash)
+        print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce
+        payload = pack('>Q', nonce) + payload
+        """t = (hash,payload,embeddedTime,'no')
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''')
+        shared.sqlSubmitQueue.put(t)
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlSubmitQueue.put('commit')
+        shared.sqlLock.release()"""
+
+        inventoryHash = calculateInventoryHash(payload)
+        objectType = 'pubkey'
+        shared.inventory[inventoryHash] = (
+            objectType, streamNumber, payload, embeddedTime)
+
+        with shared.printLock:
+            print 'broadcasting inv with hash:', inventoryHash.encode('hex')
+
+        shared.broadcastToSendDataQueues((
+            streamNumber, 'sendinv', inventoryHash))
+        shared.UISignalQueue.put(('updateStatusBar', ''))
+        shared.config.set(
+            myAddress, 'lastpubkeysendtime', str(int(time.time())))
+        with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+            shared.config.write(configfile)
+
+    def doPOWForMyV3Pubkey(self, hash):  # This function also broadcasts out the pubkey message once it is done with the POW
+        myAddress = shared.myAddressesByHash[hash]
+        status, addressVersionNumber, streamNumber, hash = decodeAddress(
+            myAddress)
+        embeddedTime = int(time.time() + random.randrange(
+            -300, 300))  # the current time plus or minus five minutes
+        payload = pack('>I', (embeddedTime))
+        payload += encodeVarint(addressVersionNumber)  # Address version number
+        payload += encodeVarint(streamNumber)
+        payload += '\x00\x00\x00\x01'  # bitfield of features supported by me (see the wiki).
+
+        try:
+            privSigningKeyBase58 = shared.config.get(
+                myAddress, 'privsigningkey')
+            privEncryptionKeyBase58 = shared.config.get(
+                myAddress, 'privencryptionkey')
+        except Exception as err:
+            with shared.printLock:
+                sys.stderr.write(
+                    'Error within doPOWForMyV3Pubkey. Could not read the keys from the keys.dat file for a requested address. %s\n' % err)
+
+            return
+
+        privSigningKeyHex = shared.decodeWalletImportFormat(
+            privSigningKeyBase58).encode('hex')
+        privEncryptionKeyHex = shared.decodeWalletImportFormat(
+            privEncryptionKeyBase58).encode('hex')
+        pubSigningKey = highlevelcrypto.privToPub(
+            privSigningKeyHex).decode('hex')
+        pubEncryptionKey = highlevelcrypto.privToPub(
+            privEncryptionKeyHex).decode('hex')
+
+        payload += pubSigningKey[1:]
+        payload += pubEncryptionKey[1:]
+
+        payload += encodeVarint(shared.config.getint(
+            myAddress, 'noncetrialsperbyte'))
+        payload += encodeVarint(shared.config.getint(
+            myAddress, 'payloadlengthextrabytes'))
+        signature = highlevelcrypto.sign(payload, privSigningKeyHex)
+        payload += encodeVarint(len(signature))
+        payload += signature
+
+        # Do the POW for this pubkey message
+        target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes +
+                             8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
+        print '(For pubkey message) Doing proof of work...'
+        initialHash = hashlib.sha512(payload).digest()
+        trialValue, nonce = proofofwork.run(target, initialHash)
+        print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce
+
+        payload = pack('>Q', nonce) + payload
+        """t = (hash,payload,embeddedTime,'no')
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''')
+        shared.sqlSubmitQueue.put(t)
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlSubmitQueue.put('commit')
+        shared.sqlLock.release()"""
+
+        inventoryHash = calculateInventoryHash(payload)
+        objectType = 'pubkey'
+        shared.inventory[inventoryHash] = (
+            objectType, streamNumber, payload, embeddedTime)
+
+        with shared.printLock:
+            print 'broadcasting inv with hash:', inventoryHash.encode('hex')
+
+        shared.broadcastToSendDataQueues((
+            streamNumber, 'sendinv', inventoryHash))
+        shared.UISignalQueue.put(('updateStatusBar', ''))
+        shared.config.set(
+            myAddress, 'lastpubkeysendtime', str(int(time.time())))
+        with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+            shared.config.write(configfile)
+
+    def sendBroadcast(self):
+        shared.sqlLock.acquire()
+        t = ('broadcastqueued',)
+        shared.sqlSubmitQueue.put(
+            '''SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=? and folder='sent' ''')
+        shared.sqlSubmitQueue.put(t)
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        for row in queryreturn:
+            fromaddress, subject, body, ackdata = row
+            status, addressVersionNumber, streamNumber, ripe = decodeAddress(
+                fromaddress)
+            """if addressVersionNumber == 2 and int(time.time()) < shared.encryptedBroadcastSwitchoverTime:
+                # We need to convert our private keys to public keys in order
+                # to include them.
+                try:
+                    privSigningKeyBase58 = shared.config.get(
+                        fromaddress, 'privsigningkey')
+                    privEncryptionKeyBase58 = shared.config.get(
+                        fromaddress, 'privencryptionkey')
+                except:
+                    shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
+                        ackdata, tr.translateText("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file."))))
+                    continue
+
+                privSigningKeyHex = shared.decodeWalletImportFormat(
+                    privSigningKeyBase58).encode('hex')
+                privEncryptionKeyHex = shared.decodeWalletImportFormat(
+                    privEncryptionKeyBase58).encode('hex')
+
+                pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode(
+                    'hex')  # At this time these pubkeys are 65 bytes long because they include the encoding byte which we won't be sending in the broadcast message.
+                pubEncryptionKey = highlevelcrypto.privToPub(
+                    privEncryptionKeyHex).decode('hex')
+
+                payload = pack('>Q', (int(time.time()) + random.randrange(
+                    -300, 300)))  # the current time plus or minus five minutes
+                payload += encodeVarint(1)  # broadcast version
+                payload += encodeVarint(addressVersionNumber)
+                payload += encodeVarint(streamNumber)
+                payload += '\x00\x00\x00\x01'  # behavior bitfield
+                payload += pubSigningKey[1:]
+                payload += pubEncryptionKey[1:]
+                payload += ripe
+                payload += '\x02'  # message encoding type
+                payload += encodeVarint(len(
+                    'Subject:' + subject + '\n' + 'Body:' + body))  # Type 2 is simple UTF-8 message encoding.
+                payload += 'Subject:' + subject + '\n' + 'Body:' + body
+
+                signature = highlevelcrypto.sign(payload, privSigningKeyHex)
+                payload += encodeVarint(len(signature))
+                payload += signature
+
+                target = 2 ** 64 / ((len(
+                    payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
+                print '(For broadcast message) Doing proof of work...'
+                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
+                    ackdata, tr.translateText("MainWindow", "Doing work necessary to send broadcast..."))))
+                initialHash = hashlib.sha512(payload).digest()
+                trialValue, nonce = proofofwork.run(target, initialHash)
+                print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce
+
+                payload = pack('>Q', nonce) + payload
+
+                inventoryHash = calculateInventoryHash(payload)
+                objectType = 'broadcast'
+                shared.inventory[inventoryHash] = (
+                    objectType, streamNumber, payload, int(time.time()))
+                print 'Broadcasting inv for my broadcast (within sendBroadcast function):', inventoryHash.encode('hex')
+                shared.broadcastToSendDataQueues((
+                    streamNumber, 'sendinv', inventoryHash))
+
+                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, tr.translateText("MainWindow", "Broadcast sent on %1").arg(unicode(
+                    strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
+
+                # Update the status of the message in the 'sent' table to have
+                # a 'broadcastsent' status
+                shared.sqlLock.acquire()
+                t = ('broadcastsent', int(
+                    time.time()), fromaddress, subject, body, 'broadcastqueued')
+                shared.sqlSubmitQueue.put(
+                    'UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?')
+                shared.sqlSubmitQueue.put(t)
+                queryreturn = shared.sqlReturnQueue.get()
+                shared.sqlSubmitQueue.put('commit')
+                shared.sqlLock.release()"""
+            if addressVersionNumber == 2 or addressVersionNumber == 3:
+                # We need to convert our private keys to public keys in order
+                # to include them.
+                try:
+                    privSigningKeyBase58 = shared.config.get(
+                        fromaddress, 'privsigningkey')
+                    privEncryptionKeyBase58 = shared.config.get(
+                        fromaddress, 'privencryptionkey')
+                except:
+                    shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
+                        ackdata, tr.translateText("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file."))))
+                    continue
+
+                privSigningKeyHex = shared.decodeWalletImportFormat(
+                    privSigningKeyBase58).encode('hex')
+                privEncryptionKeyHex = shared.decodeWalletImportFormat(
+                    privEncryptionKeyBase58).encode('hex')
+
+                pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode(
+                    'hex')  # At this time these pubkeys are 65 bytes long because they include the encoding byte which we won't be sending in the broadcast message.
+                pubEncryptionKey = highlevelcrypto.privToPub(
+                    privEncryptionKeyHex).decode('hex')
+
+                payload = pack('>Q', (int(time.time()) + random.randrange(
+                    -300, 300)))  # the current time plus or minus five minutes
+                payload += encodeVarint(2)  # broadcast version
+                payload += encodeVarint(streamNumber)
+
+                dataToEncrypt = encodeVarint(2)  # broadcast version
+                dataToEncrypt += encodeVarint(addressVersionNumber)
+                dataToEncrypt += encodeVarint(streamNumber)
+                dataToEncrypt += '\x00\x00\x00\x01'  # behavior bitfield
+                dataToEncrypt += pubSigningKey[1:]
+                dataToEncrypt += pubEncryptionKey[1:]
+		if addressVersionNumber >= 3:
+                    dataToEncrypt += encodeVarint(shared.config.getint(fromaddress,'noncetrialsperbyte'))
+                    dataToEncrypt += encodeVarint(shared.config.getint(fromaddress,'payloadlengthextrabytes'))
+                dataToEncrypt += '\x02' # message encoding type
+                dataToEncrypt += encodeVarint(len('Subject:' + subject + '\n' + 'Body:' + body))  #Type 2 is simple UTF-8 message encoding per the documentation on the wiki.
+                dataToEncrypt += 'Subject:' + subject + '\n' + 'Body:' + body
+                signature = highlevelcrypto.sign(
+                    dataToEncrypt, privSigningKeyHex)
+                dataToEncrypt += encodeVarint(len(signature))
+                dataToEncrypt += signature
+
+                # Encrypt the broadcast with the information contained in the broadcaster's address. Anyone who knows the address can generate 
+                # the private encryption key to decrypt the broadcast. This provides virtually no privacy; its purpose is to keep questionable 
+                # and illegal content from flowing through the Internet connections and being stored on the disk of 3rd parties. 
+                privEncryptionKey = hashlib.sha512(encodeVarint(
+                    addressVersionNumber) + encodeVarint(streamNumber) + ripe).digest()[:32]
+                pubEncryptionKey = pointMult(privEncryptionKey)
+                payload += highlevelcrypto.encrypt(
+                    dataToEncrypt, pubEncryptionKey.encode('hex'))
+
+                target = 2 ** 64 / ((len(
+                    payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
+                print '(For broadcast message) Doing proof of work...'
+                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
+                    ackdata, tr.translateText("MainWindow", "Doing work necessary to send broadcast..."))))
+                initialHash = hashlib.sha512(payload).digest()
+                trialValue, nonce = proofofwork.run(target, initialHash)
+                print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce
+
+                payload = pack('>Q', nonce) + payload
+
+                inventoryHash = calculateInventoryHash(payload)
+                objectType = 'broadcast'
+                shared.inventory[inventoryHash] = (
+                    objectType, streamNumber, payload, int(time.time()))
+                print 'sending inv (within sendBroadcast function)'
+                shared.broadcastToSendDataQueues((
+                    streamNumber, 'sendinv', inventoryHash))
+
+                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, tr.translateText("MainWindow", "Broadcast sent on %1").arg(unicode(
+                    strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
+
+                # Update the status of the message in the 'sent' table to have
+                # a 'broadcastsent' status
+                shared.sqlLock.acquire()
+                t = ('broadcastsent', int(
+                    time.time()), fromaddress, subject, body, 'broadcastqueued')
+                shared.sqlSubmitQueue.put(
+                    'UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?')
+                shared.sqlSubmitQueue.put(t)
+                queryreturn = shared.sqlReturnQueue.get()
+                shared.sqlSubmitQueue.put('commit')
+                shared.sqlLock.release()
+            else:
+                with shared.printLock:
+                    sys.stderr.write(
+                        'Error: In the singleWorker thread, the sendBroadcast function doesn\'t understand the address version.\n')
+
+
+    def sendMsg(self):
+        # Check to see if there are any messages queued to be sent
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put(
+            '''SELECT DISTINCT toaddress FROM sent WHERE (status='msgqueued' AND folder='sent')''')
+        shared.sqlSubmitQueue.put('')
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        for row in queryreturn:  # For each address to which we need to send a message, check to see if we have its pubkey already.
+            toaddress, = row
+            toripe = decodeAddress(toaddress)[3]
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''SELECT hash FROM pubkeys WHERE hash=? ''')
+            shared.sqlSubmitQueue.put((toripe,))
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            if queryreturn != []:  # If we have the needed pubkey, set the status to doingmsgpow (we'll do it further down)
+                t = (toaddress,)
+                shared.sqlLock.acquire()
+                shared.sqlSubmitQueue.put(
+                    '''UPDATE sent SET status='doingmsgpow' WHERE toaddress=? AND status='msgqueued' ''')
+                shared.sqlSubmitQueue.put(t)
+                shared.sqlReturnQueue.get()
+                shared.sqlSubmitQueue.put('commit')
+                shared.sqlLock.release()
+            else:  # We don't have the needed pubkey. Set the status to 'awaitingpubkey' and request it if we haven't already
+                if toripe in shared.neededPubkeys:
+                    # We already sent a request for the pubkey
+                    t = (toaddress,)
+                    shared.sqlLock.acquire()
+                    shared.sqlSubmitQueue.put(
+                        '''UPDATE sent SET status='awaitingpubkey' WHERE toaddress=? AND status='msgqueued' ''')
+                    shared.sqlSubmitQueue.put(t)
+                    shared.sqlReturnQueue.get()
+                    shared.sqlSubmitQueue.put('commit')
+                    shared.sqlLock.release()
+                    shared.UISignalQueue.put(('updateSentItemStatusByHash', (
+                        toripe, tr.translateText("MainWindow",'Encryption key was requested earlier.'))))
+                else:
+                    # We have not yet sent a request for the pubkey
+                    t = (toaddress,)
+                    shared.sqlLock.acquire()
+                    shared.sqlSubmitQueue.put(
+                        '''UPDATE sent SET status='doingpubkeypow' WHERE toaddress=? AND status='msgqueued' ''')
+                    shared.sqlSubmitQueue.put(t)
+                    shared.sqlReturnQueue.get()
+                    shared.sqlSubmitQueue.put('commit')
+                    shared.sqlLock.release()
+                    shared.UISignalQueue.put(('updateSentItemStatusByHash', (
+                        toripe, tr.translateText("MainWindow",'Sending a request for the recipient\'s encryption key.'))))
+                    self.requestPubKey(toaddress)
+        shared.sqlLock.acquire()
+        # Get all messages that are ready to be sent, and also all messages
+        # which we have sent in the last 28 days which were previously marked
+        # as 'toodifficult'. If the user as raised the maximum acceptable
+        # difficulty then those messages may now be sendable.
+        shared.sqlSubmitQueue.put(
+            '''SELECT toaddress, toripe, fromaddress, subject, message, ackdata, status FROM sent WHERE (status='doingmsgpow' or status='forcepow' or (status='toodifficult' and lastactiontime>?)) and folder='sent' ''')
+        shared.sqlSubmitQueue.put((int(time.time()) - 2419200,))
+        queryreturn = shared.sqlReturnQueue.get()
+        shared.sqlLock.release()
+        for row in queryreturn:  # For each message we need to send..
+            toaddress, toripe, fromaddress, subject, message, ackdata, status = row
+            # There is a remote possibility that we may no longer have the
+            # recipient's pubkey. Let us make sure we still have it or else the
+            # sendMsg function will appear to freeze. This can happen if the
+            # user sends a message but doesn't let the POW function finish,
+            # then leaves their client off for a long time which could cause
+            # the needed pubkey to expire and be deleted.
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put(
+                '''SELECT hash FROM pubkeys WHERE hash=? ''')
+            shared.sqlSubmitQueue.put((toripe,))
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            if queryreturn == [] and toripe not in shared.neededPubkeys:
+                # We no longer have the needed pubkey and we haven't requested
+                # it.
+                with shared.printLock:
+                    sys.stderr.write(
+                        'For some reason, the status of a message in our outbox is \'doingmsgpow\' even though we lack the pubkey. Here is the RIPE hash of the needed pubkey: %s\n' % toripe.encode('hex'))
+
+                t = (toaddress,)
+                shared.sqlLock.acquire()
+                shared.sqlSubmitQueue.put(
+                    '''UPDATE sent SET status='msgqueued' WHERE toaddress=? AND status='doingmsgpow' ''')
+                shared.sqlSubmitQueue.put(t)
+                shared.sqlReturnQueue.get()
+                shared.sqlSubmitQueue.put('commit')
+                shared.sqlLock.release()
+                shared.UISignalQueue.put(('updateSentItemStatusByHash', (
+                    toripe, tr.translateText("MainWindow",'Sending a request for the recipient\'s encryption key.'))))
+                self.requestPubKey(toaddress)
+                continue
+            shared.ackdataForWhichImWatching[ackdata] = 0
+            toStatus, toAddressVersionNumber, toStreamNumber, toHash = decodeAddress(
+                toaddress)
+            fromStatus, fromAddressVersionNumber, fromStreamNumber, fromHash = decodeAddress(
+                fromaddress)
+            shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
+                ackdata, tr.translateText("MainWindow", "Looking up the receiver\'s public key"))))
+            with shared.printLock:
+                print 'Found a message in our database that needs to be sent with this pubkey.'
+                print 'First 150 characters of message:', repr(message[:150])
+
+
+            # mark the pubkey as 'usedpersonally' so that we don't ever delete
+            # it.
+            shared.sqlLock.acquire()
+            t = (toripe,)
+            shared.sqlSubmitQueue.put(
+                '''UPDATE pubkeys SET usedpersonally='yes' WHERE hash=?''')
+            shared.sqlSubmitQueue.put(t)
+            shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            # Let us fetch the recipient's public key out of our database. If
+            # the required proof of work difficulty is too hard then we'll
+            # abort.
+            shared.sqlSubmitQueue.put(
+                'SELECT transmitdata FROM pubkeys WHERE hash=?')
+            shared.sqlSubmitQueue.put((toripe,))
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlLock.release()
+            if queryreturn == []:
+                with shared.printLock:
+                    sys.stderr.write(
+                        '(within sendMsg) The needed pubkey was not found. This should never happen. Aborting send.\n')
+
+                return
+            for row in queryreturn:
+                pubkeyPayload, = row
+
+            # The pubkey message is stored the way we originally received it
+            # which means that we need to read beyond things like the nonce and
+            # time to get to the actual public keys.
+            readPosition = 8  # to bypass the nonce
+            pubkeyEmbeddedTime, = unpack(
+                '>I', pubkeyPayload[readPosition:readPosition + 4])
+            # This section is used for the transition from 32 bit time to 64
+            # bit time in the protocol.
+            if pubkeyEmbeddedTime == 0:
+                pubkeyEmbeddedTime, = unpack(
+                    '>Q', pubkeyPayload[readPosition:readPosition + 8])
+                readPosition += 8
+            else:
+                readPosition += 4
+            readPosition += 1  # to bypass the address version whose length is definitely 1
+            streamNumber, streamNumberLength = decodeVarint(
+                pubkeyPayload[readPosition:readPosition + 10])
+            readPosition += streamNumberLength
+            behaviorBitfield = pubkeyPayload[readPosition:readPosition + 4]
+            readPosition += 4  # to bypass the bitfield of behaviors
+            # pubSigningKeyBase256 =
+            # pubkeyPayload[readPosition:readPosition+64] #We don't use this
+            # key for anything here.
+            readPosition += 64
+            pubEncryptionKeyBase256 = pubkeyPayload[
+                readPosition:readPosition + 64]
+            readPosition += 64
+            if toAddressVersionNumber == 2:
+                requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
+                requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
+                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
+                    ackdata, tr.translateText("MainWindow", "Doing work necessary to send message.\nThere is no required difficulty for version 2 addresses like this."))))
+            elif toAddressVersionNumber == 3:
+                requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(
+                    pubkeyPayload[readPosition:readPosition + 10])
+                readPosition += varintLength
+                requiredPayloadLengthExtraBytes, varintLength = decodeVarint(
+                    pubkeyPayload[readPosition:readPosition + 10])
+                readPosition += varintLength
+                if requiredAverageProofOfWorkNonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte:  # We still have to meet a minimum POW difficulty regardless of what they say is allowed in order to get our message to propagate through the network.
+                    requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
+                if requiredPayloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes:
+                    requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
+                shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, tr.translateText("MainWindow", "Doing work necessary to send message.\nReceiver\'s required difficulty: %1 and %2").arg(str(float(
+                    requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte)).arg(str(float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)))))
+                if status != 'forcepow':
+                    if (requiredAverageProofOfWorkNonceTrialsPerByte > shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') and shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') != 0) or (requiredPayloadLengthExtraBytes > shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') and shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') != 0):
+                        # The demanded difficulty is more than we are willing
+                        # to do.
+                        shared.sqlLock.acquire()
+                        t = (ackdata,)
+                        shared.sqlSubmitQueue.put(
+                            '''UPDATE sent SET status='toodifficult' WHERE ackdata=? ''')
+                        shared.sqlSubmitQueue.put(t)
+                        shared.sqlReturnQueue.get()
+                        shared.sqlSubmitQueue.put('commit')
+                        shared.sqlLock.release()
+                        shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, tr.translateText("MainWindow", "Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do.").arg(str(float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte)).arg(str(float(
+                            requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)).arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
+                        continue
+
+            embeddedTime = pack('>Q', (int(time.time()) + random.randrange(
+                -300, 300)))  # the current time plus or minus five minutes. We will use this time both for our message and for the ackdata packed within our message.
+            if fromAddressVersionNumber == 2:
+                payload = '\x01'  # Message version.
+                payload += encodeVarint(fromAddressVersionNumber)
+                payload += encodeVarint(fromStreamNumber)
+                payload += '\x00\x00\x00\x01'  # Bitfield of features and behaviors that can be expected from me. (See https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features  )
+
+                # We need to convert our private keys to public keys in order
+                # to include them.
+                try:
+                    privSigningKeyBase58 = shared.config.get(
+                        fromaddress, 'privsigningkey')
+                    privEncryptionKeyBase58 = shared.config.get(
+                        fromaddress, 'privencryptionkey')
+                except:
+                    shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
+                        ackdata, tr.translateText("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file."))))
+                    continue
+
+                privSigningKeyHex = shared.decodeWalletImportFormat(
+                    privSigningKeyBase58).encode('hex')
+                privEncryptionKeyHex = shared.decodeWalletImportFormat(
+                    privEncryptionKeyBase58).encode('hex')
+
+                pubSigningKey = highlevelcrypto.privToPub(
+                    privSigningKeyHex).decode('hex')
+                pubEncryptionKey = highlevelcrypto.privToPub(
+                    privEncryptionKeyHex).decode('hex')
+
+                payload += pubSigningKey[
+                    1:]  # The \x04 on the beginning of the public keys are not sent. This way there is only one acceptable way to encode and send a public key.
+                payload += pubEncryptionKey[1:]
+
+                payload += toHash  # This hash will be checked by the receiver of the message to verify that toHash belongs to them. This prevents a Surreptitious Forwarding Attack.
+                payload += '\x02'  # Type 2 is simple UTF-8 message encoding as specified on the Protocol Specification on the Bitmessage Wiki.
+                messageToTransmit = 'Subject:' + \
+                    subject + '\n' + 'Body:' + message
+                payload += encodeVarint(len(messageToTransmit))
+                payload += messageToTransmit
+                fullAckPayload = self.generateFullAckMessage(
+                    ackdata, toStreamNumber, embeddedTime)  # The fullAckPayload is a normal msg protocol message with the proof of work already completed that the receiver of this message can easily send out.
+                payload += encodeVarint(len(fullAckPayload))
+                payload += fullAckPayload
+                signature = highlevelcrypto.sign(payload, privSigningKeyHex)
+                payload += encodeVarint(len(signature))
+                payload += signature
+
+            if fromAddressVersionNumber == 3:
+                payload = '\x01'  # Message version.
+                payload += encodeVarint(fromAddressVersionNumber)
+                payload += encodeVarint(fromStreamNumber)
+                payload += '\x00\x00\x00\x01'  # Bitfield of features and behaviors that can be expected from me. (See https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features  )
+
+                # We need to convert our private keys to public keys in order
+                # to include them.
+                try:
+                    privSigningKeyBase58 = shared.config.get(
+                        fromaddress, 'privsigningkey')
+                    privEncryptionKeyBase58 = shared.config.get(
+                        fromaddress, 'privencryptionkey')
+                except:
+                    shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (
+                        ackdata, tr.translateText("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file."))))
+                    continue
+
+                privSigningKeyHex = shared.decodeWalletImportFormat(
+                    privSigningKeyBase58).encode('hex')
+                privEncryptionKeyHex = shared.decodeWalletImportFormat(
+                    privEncryptionKeyBase58).encode('hex')
+
+                pubSigningKey = highlevelcrypto.privToPub(
+                    privSigningKeyHex).decode('hex')
+                pubEncryptionKey = highlevelcrypto.privToPub(
+                    privEncryptionKeyHex).decode('hex')
+
+                payload += pubSigningKey[
+                    1:]  # The \x04 on the beginning of the public keys are not sent. This way there is only one acceptable way to encode and send a public key.
+                payload += pubEncryptionKey[1:]
+                # If the receiver of our message is in our address book,
+                # subscriptions list, or whitelist then we will allow them to
+                # do the network-minimum proof of work. Let us check to see if
+                # the receiver is in any of those lists.
+                if shared.isAddressInMyAddressBookSubscriptionsListOrWhitelist(toaddress):
+                    payload += encodeVarint(
+                        shared.networkDefaultProofOfWorkNonceTrialsPerByte)
+                    payload += encodeVarint(
+                        shared.networkDefaultPayloadLengthExtraBytes)
+                else:
+                    payload += encodeVarint(shared.config.getint(
+                        fromaddress, 'noncetrialsperbyte'))
+                    payload += encodeVarint(shared.config.getint(
+                        fromaddress, 'payloadlengthextrabytes'))
+
+                payload += toHash  # This hash will be checked by the receiver of the message to verify that toHash belongs to them. This prevents a Surreptitious Forwarding Attack.
+                payload += '\x02'  # Type 2 is simple UTF-8 message encoding as specified on the Protocol Specification on the Bitmessage Wiki.
+                messageToTransmit = 'Subject:' + \
+                    subject + '\n' + 'Body:' + message
+                payload += encodeVarint(len(messageToTransmit))
+                payload += messageToTransmit
+                fullAckPayload = self.generateFullAckMessage(
+                    ackdata, toStreamNumber, embeddedTime)  # The fullAckPayload is a normal msg protocol message with the proof of work already completed that the receiver of this message can easily send out.
+                payload += encodeVarint(len(fullAckPayload))
+                payload += fullAckPayload
+                signature = highlevelcrypto.sign(payload, privSigningKeyHex)
+                payload += encodeVarint(len(signature))
+                payload += signature
+
+
+            # We have assembled the data that will be encrypted.
+            try:
+                encrypted = highlevelcrypto.encrypt(payload,"04"+pubEncryptionKeyBase256.encode('hex'))
+            except:
+                shared.sqlLock.acquire()
+                t = (ackdata,)
+                shared.sqlSubmitQueue.put('''UPDATE sent SET status='badkey' WHERE ackdata=?''')
+                shared.sqlSubmitQueue.put(t)
+                queryreturn = shared.sqlReturnQueue.get()
+                shared.sqlSubmitQueue.put('commit')
+                shared.sqlLock.release()
+                shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,tr.translateText("MainWindow",'Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1').arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))))
+                continue
+            encryptedPayload = embeddedTime + encodeVarint(toStreamNumber) + encrypted
+            target = 2**64 / ((len(encryptedPayload)+requiredPayloadLengthExtraBytes+8) * requiredAverageProofOfWorkNonceTrialsPerByte)
+            with shared.printLock:
+                print '(For msg message) Doing proof of work. Total required difficulty:', float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte, 'Required small message difficulty:', float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes
+
+            powStartTime = time.time()
+            initialHash = hashlib.sha512(encryptedPayload).digest()
+            trialValue, nonce = proofofwork.run(target, initialHash)
+            with shared.printLock:
+                print '(For msg message) Found proof of work', trialValue, 'Nonce:', nonce
+                try:
+                    print 'POW took', int(time.time() - powStartTime), 'seconds.', nonce / (time.time() - powStartTime), 'nonce trials per second.'
+                except:
+                    pass
+
+            encryptedPayload = pack('>Q', nonce) + encryptedPayload
+
+            inventoryHash = calculateInventoryHash(encryptedPayload)
+            objectType = 'msg'
+            shared.inventory[inventoryHash] = (
+                objectType, toStreamNumber, encryptedPayload, int(time.time()))
+            shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, tr.translateText("MainWindow", "Message sent. Waiting on acknowledgement. Sent on %1").arg(unicode(
+                strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
+            print 'Broadcasting inv for my msg(within sendmsg function):', inventoryHash.encode('hex')
+            shared.broadcastToSendDataQueues((
+                streamNumber, 'sendinv', inventoryHash))
+
+            # Update the status of the message in the 'sent' table to have a
+            # 'msgsent' status
+            shared.sqlLock.acquire()
+            t = (ackdata,)
+            shared.sqlSubmitQueue.put('''UPDATE sent SET status='msgsent' WHERE ackdata=?''')
+            shared.sqlSubmitQueue.put(t)
+            queryreturn = shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            shared.sqlLock.release()
+
+    def requestPubKey(self, toAddress):
+        toStatus, addressVersionNumber, streamNumber, ripe = decodeAddress(
+            toAddress)
+        if toStatus != 'success':
+            with shared.printLock:
+                sys.stderr.write('Very abnormal error occurred in requestPubKey. toAddress is: ' + repr(
+                    toAddress) + '. Please report this error to Atheros.')
+
+            return
+        shared.neededPubkeys[ripe] = 0
+        payload = pack('>Q', (int(time.time()) + random.randrange(
+            -300, 300)))  # the current time plus or minus five minutes.
+        payload += encodeVarint(addressVersionNumber)
+        payload += encodeVarint(streamNumber)
+        payload += ripe
+        with shared.printLock:
+            print 'making request for pubkey with ripe:', ripe.encode('hex')
+
+        # print 'trial value', trialValue
+        statusbar = 'Doing the computations necessary to request the recipient\'s public key.'
+        shared.UISignalQueue.put(('updateStatusBar', statusbar))
+        shared.UISignalQueue.put(('updateSentItemStatusByHash', (
+            ripe, tr.translateText("MainWindow",'Doing work necessary to request encryption key.'))))
+        target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes +
+                             8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
+        initialHash = hashlib.sha512(payload).digest()
+        trialValue, nonce = proofofwork.run(target, initialHash)
+        with shared.printLock:
+            print 'Found proof of work', trialValue, 'Nonce:', nonce
+
+
+        payload = pack('>Q', nonce) + payload
+        inventoryHash = calculateInventoryHash(payload)
+        objectType = 'getpubkey'
+        shared.inventory[inventoryHash] = (
+            objectType, streamNumber, payload, int(time.time()))
+        print 'sending inv (for the getpubkey message)'
+        shared.broadcastToSendDataQueues((
+            streamNumber, 'sendinv', inventoryHash))
+
+        t = (toAddress,)
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put(
+            '''UPDATE sent SET status='awaitingpubkey' WHERE toaddress=? AND status='doingpubkeypow' ''')
+        shared.sqlSubmitQueue.put(t)
+        shared.sqlReturnQueue.get()
+        shared.sqlSubmitQueue.put('commit')
+        shared.sqlLock.release()
+
+        shared.UISignalQueue.put((
+            'updateStatusBar', tr.translateText("MainWindow",'Broacasting the public key request. This program will auto-retry if they are offline.')))
+        shared.UISignalQueue.put(('updateSentItemStatusByHash', (ripe, tr.translateText("MainWindow",'Sending public key request. Waiting for reply. Requested at %1').arg(unicode(
+            strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
+
+    def generateFullAckMessage(self, ackdata, toStreamNumber, embeddedTime):
+        payload = embeddedTime + encodeVarint(toStreamNumber) + ackdata
+        target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes +
+                             8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
+        with shared.printLock:
+            print '(For ack message) Doing proof of work...'
+
+        powStartTime = time.time()
+        initialHash = hashlib.sha512(payload).digest()
+        trialValue, nonce = proofofwork.run(target, initialHash)
+        with shared.printLock:
+            print '(For ack message) Found proof of work', trialValue, 'Nonce:', nonce
+            try:
+                print 'POW took', int(time.time() - powStartTime), 'seconds.', nonce / (time.time() - powStartTime), 'nonce trials per second.'
+            except:
+                pass
+
+        payload = pack('>Q', nonce) + payload
+        headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
+        headerData += 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+        headerData += pack('>L', len(payload))
+        headerData += hashlib.sha512(payload).digest()[:4]
+        return headerData + payload

src/class_sqlThread.py

@@ -0,0 +1,274 @@
+import threading
+import shared
+import sqlite3
+import time
+import shutil  # used for moving the messages.dat file
+import sys
+import os
+
+# This thread exists because SQLITE3 is so un-threadsafe that we must
+# submit queries to it and it puts results back in a different queue. They
+# won't let us just use locks.
+
+
+class sqlThread(threading.Thread):
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def run(self):
+        self.conn = sqlite3.connect(shared.appdata + 'messages.dat')
+        self.conn.text_factory = str
+        self.cur = self.conn.cursor()
+        try:
+            self.cur.execute(
+                '''CREATE TABLE inbox (msgid blob, toaddress text, fromaddress text, subject text, received text, message text, folder text, encodingtype int, read bool, UNIQUE(msgid) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''CREATE TABLE sent (msgid blob, toaddress text, toripe blob, fromaddress text, subject text, message text, ackdata blob, lastactiontime integer, status text, pubkeyretrynumber integer, msgretrynumber integer, folder text, encodingtype int)''' )
+            self.cur.execute(
+                '''CREATE TABLE subscriptions (label text, address text, enabled bool)''' )
+            self.cur.execute(
+                '''CREATE TABLE addressbook (label text, address text)''' )
+            self.cur.execute(
+                '''CREATE TABLE blacklist (label text, address text, enabled bool)''' )
+            self.cur.execute(
+                '''CREATE TABLE whitelist (label text, address text, enabled bool)''' )
+            # Explanation of what is in the pubkeys table:
+            #   The hash is the RIPEMD160 hash that is encoded in the Bitmessage address.
+            #   transmitdata is literally the data that was included in the Bitmessage pubkey message when it arrived, except for the 24 byte protocol header- ie, it starts with the POW nonce.
+            #   time is the time that the pubkey was broadcast on the network same as with every other type of Bitmessage object.
+            # usedpersonally is set to "yes" if we have used the key
+            # personally. This keeps us from deleting it because we may want to
+            # reply to a message in the future. This field is not a bool
+            # because we may need more flexability in the future and it doesn't
+            # take up much more space anyway.
+            self.cur.execute(
+                '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''CREATE TABLE inventory (hash blob, objecttype text, streamnumber int, payload blob, receivedtime integer, UNIQUE(hash) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''CREATE TABLE knownnodes (timelastseen int, stream int, services blob, host blob, port blob, UNIQUE(host, stream, port) ON CONFLICT REPLACE)''' )
+                             # This table isn't used in the program yet but I
+                             # have a feeling that we'll need it.
+            self.cur.execute(
+                '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
+            self.cur.execute(
+                '''CREATE TABLE settings (key blob, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' )
+            self.cur.execute( '''INSERT INTO settings VALUES('version','1')''')
+            self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
+                int(time.time()),))
+            self.conn.commit()
+            print 'Created messages database file'
+        except Exception as err:
+            if str(err) == 'table inbox already exists':
+                with shared.printLock:
+                    print 'Database file already exists.'
+
+            else:
+                sys.stderr.write(
+                    'ERROR trying to create database file (message.dat). Error message: %s\n' % str(err))
+                os._exit(0)
+
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 1:
+            shared.config.set('bitmessagesettings', 'settingsversion', '2')
+                      # If the settings version is equal to 2 or 3 then the
+                      # sqlThread will modify the pubkeys table and change
+                      # the settings version to 4.
+            shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
+            shared.config.set('bitmessagesettings', 'sockshostname', 'localhost')
+            shared.config.set('bitmessagesettings', 'socksport', '9050')
+            shared.config.set('bitmessagesettings', 'socksauthentication', 'false')
+            shared.config.set('bitmessagesettings', 'socksusername', '')
+            shared.config.set('bitmessagesettings', 'sockspassword', '')
+            shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
+            shared.config.set('bitmessagesettings', 'messagesencrypted', 'false')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
+        # People running earlier versions of PyBitmessage do not have the
+        # usedpersonally field in their pubkeys table. Let's add it.
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 2:
+            item = '''ALTER TABLE pubkeys ADD usedpersonally text DEFAULT 'no' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+            self.conn.commit()
+
+            shared.config.set('bitmessagesettings', 'settingsversion', '3')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
+        # People running earlier versions of PyBitmessage do not have the
+        # encodingtype field in their inbox and sent tables or the read field
+        # in the inbox table. Let's add them.
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 3:
+            item = '''ALTER TABLE inbox ADD encodingtype int DEFAULT '2' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+
+            item = '''ALTER TABLE inbox ADD read bool DEFAULT '1' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+
+            item = '''ALTER TABLE sent ADD encodingtype int DEFAULT '2' '''
+            parameters = ''
+            self.cur.execute(item, parameters)
+            self.conn.commit()
+
+            shared.config.set('bitmessagesettings', 'settingsversion', '4')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 4:
+            shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
+                shared.networkDefaultProofOfWorkNonceTrialsPerByte))
+            shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
+                shared.networkDefaultPayloadLengthExtraBytes))
+            shared.config.set('bitmessagesettings', 'settingsversion', '5')
+
+        if shared.config.getint('bitmessagesettings', 'settingsversion') == 5:
+            shared.config.set(
+                'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
+            shared.config.set(
+                'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
+            shared.config.set('bitmessagesettings', 'settingsversion', '6')
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)
+
+        # From now on, let us keep a 'version' embedded in the messages.dat
+        # file so that when we make changes to the database, the database
+        # version we are on can stay embedded in the messages.dat file. Let us
+        # check to see if the settings table exists yet.
+        item = '''SELECT name FROM sqlite_master WHERE type='table' AND name='settings';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        if self.cur.fetchall() == []:
+            # The settings table doesn't exist. We need to make it.
+            print 'In messages.dat database, creating new \'settings\' table.'
+            self.cur.execute(
+                '''CREATE TABLE settings (key text, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' )
+            self.cur.execute( '''INSERT INTO settings VALUES('version','1')''')
+            self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
+                int(time.time()),))
+            print 'In messages.dat database, removing an obsolete field from the pubkeys table.'
+            self.cur.execute(
+                '''CREATE TEMPORARY TABLE pubkeys_backup(hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE);''')
+            self.cur.execute(
+                '''INSERT INTO pubkeys_backup SELECT hash, transmitdata, time, usedpersonally FROM pubkeys;''')
+            self.cur.execute( '''DROP TABLE pubkeys''')
+            self.cur.execute(
+                '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' )
+            self.cur.execute(
+                '''INSERT INTO pubkeys SELECT hash, transmitdata, time, usedpersonally FROM pubkeys_backup;''')
+            self.cur.execute( '''DROP TABLE pubkeys_backup;''')
+            print 'Deleting all pubkeys from inventory. They will be redownloaded and then saved with the correct times.'
+            self.cur.execute(
+                '''delete from inventory where objecttype = 'pubkey';''')
+            print 'replacing Bitmessage announcements mailing list with a new one.'
+            self.cur.execute(
+                '''delete from subscriptions where address='BM-BbkPSZbzPwpVcYZpU4yHwf9ZPEapN5Zx' ''')
+            self.cur.execute(
+                '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
+            print 'Commiting.'
+            self.conn.commit()
+            print 'Vacuuming message.dat. You might notice that the file size gets much smaller.'
+            self.cur.execute( ''' VACUUM ''')
+
+        # After code refactoring, the possible status values for sent messages
+        # have changed.
+        self.cur.execute(
+            '''update sent set status='doingmsgpow' where status='doingpow'  ''')
+        self.cur.execute(
+            '''update sent set status='msgsent' where status='sentmessage'  ''')
+        self.cur.execute(
+            '''update sent set status='doingpubkeypow' where status='findingpubkey'  ''')
+        self.cur.execute(
+            '''update sent set status='broadcastqueued' where status='broadcastpending'  ''')
+        self.conn.commit()
+
+        try:
+            testpayload = '\x00\x00'
+            t = ('1234', testpayload, '12345678', 'no')
+            self.cur.execute( '''INSERT INTO pubkeys VALUES(?,?,?,?)''', t)
+            self.conn.commit()
+            self.cur.execute(
+                '''SELECT transmitdata FROM pubkeys WHERE hash='1234' ''')
+            queryreturn = self.cur.fetchall()
+            for row in queryreturn:
+                transmitdata, = row
+            self.cur.execute('''DELETE FROM pubkeys WHERE hash='1234' ''')
+            self.conn.commit()
+            if transmitdata == '':
+                sys.stderr.write('Problem: The version of SQLite you have cannot store Null values. Please download and install the latest revision of your version of Python (for example, the latest Python 2.7 revision) and try again.\n')
+                sys.stderr.write('PyBitmessage will now exit very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n')
+                os._exit(0)
+        except Exception as err:
+            print err
+
+        # Let us check to see the last time we vaccumed the messages.dat file.
+        # If it has been more than a month let's do it now.
+        item = '''SELECT value FROM settings WHERE key='lastvacuumtime';'''
+        parameters = ''
+        self.cur.execute(item, parameters)
+        queryreturn = self.cur.fetchall()
+        for row in queryreturn:
+            value, = row
+            if int(value) < int(time.time()) - 2592000:
+                print 'It has been a long time since the messages.dat file has been vacuumed. Vacuuming now...'
+                self.cur.execute( ''' VACUUM ''')
+                item = '''update settings set value=? WHERE key='lastvacuumtime';'''
+                parameters = (int(time.time()),)
+                self.cur.execute(item, parameters)
+
+        while True:
+            item = shared.sqlSubmitQueue.get()
+            if item == 'commit':
+                self.conn.commit()
+            elif item == 'exit':
+                self.conn.close()
+                with shared.printLock:
+                    print 'sqlThread exiting gracefully.'
+
+                return
+            elif item == 'movemessagstoprog':
+                with shared.printLock:
+                    print 'the sqlThread is moving the messages.dat file to the local program directory.'
+
+                self.conn.commit()
+                self.conn.close()
+                shutil.move(
+                    shared.lookupAppdataFolder() + 'messages.dat', 'messages.dat')
+                self.conn = sqlite3.connect('messages.dat')
+                self.conn.text_factory = str
+                self.cur = self.conn.cursor()
+            elif item == 'movemessagstoappdata':
+                with shared.printLock:
+                    print 'the sqlThread is moving the messages.dat file to the Appdata folder.'
+
+                self.conn.commit()
+                self.conn.close()
+                shutil.move(
+                    'messages.dat', shared.lookupAppdataFolder() + 'messages.dat')
+                self.conn = sqlite3.connect(shared.appdata + 'messages.dat')
+                self.conn.text_factory = str
+                self.cur = self.conn.cursor()
+            elif item == 'deleteandvacuume':
+                self.cur.execute('''delete from inbox where folder='trash' ''')
+                self.cur.execute('''delete from sent where folder='trash' ''')
+                self.conn.commit()
+                self.cur.execute( ''' VACUUM ''')
+            else:
+                parameters = shared.sqlSubmitQueue.get()
+                # print 'item', item
+                # print 'parameters', parameters
+                try:
+                    self.cur.execute(item, parameters)
+                except Exception as err:
+                    with shared.printLock:
+                        sys.stderr.write('\nMajor error occurred when trying to execute a SQL statement within the sqlThread. Please tell Atheros about this error message or post it in the forum! Error occurred while trying to execute statement: "' + str(
+                            item) + '"  Here are the parameters; you might want to censor this data with asterisks (***) as it can contain private information: ' + str(repr(parameters)) + '\nHere is the actual error message thrown by the sqlThread: ' + str(err) + '\n')
+                        sys.stderr.write('This program shall now abruptly exit!\n')
+
+                    os._exit(0)
+
+                shared.sqlReturnQueue.put(self.cur.fetchall())
+                # shared.sqlSubmitQueue.task_done()

src/debug.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+'''
+Logging and debuging facility
+=============================
+
+Levels:
+    DEBUG       Detailed information, typically of interest only when diagnosing problems.
+    INFO        Confirmation that things are working as expected.
+    WARNING     An indication that something unexpected happened, or indicative of some problem in the
+                near future (e.g. ‘disk space low’). The software is still working as expected.
+    ERROR       Due to a more serious problem, the software has not been able to perform some function.
+    CRITICAL    A serious error, indicating that the program itself may be unable to continue running.
+
+There are three loggers: `console_only`, `file_only` and `both`.
+
+Use: `from debug import logger` to import this facility into whatever module you wish to log messages from.
+     Logging is thread-safe so you don't have to worry about locks, just import and log.
+'''
+import logging
+import logging.config
+import shared
+
+# TODO(xj9): Get from a config file.
+log_level = 'DEBUG'
+
+logging.config.dictConfig({
+    'version': 1,
+    'formatters': {
+        'default': {
+            'format': '%(asctime)s - %(levelname)s - %(message)s',
+        },
+    },
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+            'formatter': 'default',
+            'level': log_level,
+            'stream': 'ext://sys.stdout'
+        },
+        'file': {
+            'class': 'logging.handlers.RotatingFileHandler',
+            'formatter': 'default',
+            'level': log_level,
+            'filename': shared.appdata + 'debug.log',
+            'maxBytes': 2097152, # 2 MiB
+            'backupCount': 1,
+        }
+    },
+    'loggers': {
+        'console_only': {
+            'handlers': ['console'],
+            'propagate' : 0
+        },
+        'file_only': {
+            'handlers': ['file'],
+            'propagate' : 0
+        },
+        'both': {
+            'handlers': ['console', 'file'],
+            'propagate' : 0
+        },
+    },
+    'root': {
+        'level': log_level,
+        'handlers': ['console'],
+    },
+})
+# TODO (xj9): Get from a config file.
+#logger = logging.getLogger('console_only')
+logger = logging.getLogger('both')

src/defaultKnownNodes.py

@@ -59,7 +59,7 @@ if __name__ == "__main__":
     APPNAME = "PyBitmessage"
     from os import path, environ
     if sys.platform == 'darwin':
-        from AppKit import NSSearchPathForDirectoriesInDomains
+        from AppKit import NSSearchPathForDirectoriesInDomains  # @UnresolvedImport
         # http://developer.apple.com/DOCUMENTATION/Cocoa/Reference/Foundation/Miscellaneous/Foundation_Functions/Reference/reference.html#//apple_ref/c/func/NSSearchPathForDirectoriesInDomains
         # NSApplicationSupportDirectory = 14
         # NSUserDomainMask = 1

src/helper_bitcoin.py

@@ -0,0 +1,44 @@
+import hashlib
+from pyelliptic import arithmetic
+
+# This function expects that pubkey begin with \x04
+def calculateBitcoinAddressFromPubkey(pubkey):
+    if len(pubkey) != 65:
+        print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey), 'bytes long rather than 65.'
+        return "error"
+    ripe = hashlib.new('ripemd160')
+    sha = hashlib.new('sha256')
+    sha.update(pubkey)
+    ripe.update(sha.digest())
+    ripeWithProdnetPrefix = '\x00' + ripe.digest()
+
+    checksum = hashlib.sha256(hashlib.sha256(
+        ripeWithProdnetPrefix).digest()).digest()[:4]
+    binaryBitcoinAddress = ripeWithProdnetPrefix + checksum
+    numberOfZeroBytesOnBinaryBitcoinAddress = 0
+    while binaryBitcoinAddress[0] == '\x00':
+        numberOfZeroBytesOnBinaryBitcoinAddress += 1
+        binaryBitcoinAddress = binaryBitcoinAddress[1:]
+    base58encoded = arithmetic.changebase(binaryBitcoinAddress, 256, 58)
+    return "1" * numberOfZeroBytesOnBinaryBitcoinAddress + base58encoded
+
+
+def calculateTestnetAddressFromPubkey(pubkey):
+    if len(pubkey) != 65:
+        print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey), 'bytes long rather than 65.'
+        return "error"
+    ripe = hashlib.new('ripemd160')
+    sha = hashlib.new('sha256')
+    sha.update(pubkey)
+    ripe.update(sha.digest())
+    ripeWithProdnetPrefix = '\x6F' + ripe.digest()
+
+    checksum = hashlib.sha256(hashlib.sha256(
+        ripeWithProdnetPrefix).digest()).digest()[:4]
+    binaryBitcoinAddress = ripeWithProdnetPrefix + checksum
+    numberOfZeroBytesOnBinaryBitcoinAddress = 0
+    while binaryBitcoinAddress[0] == '\x00':
+        numberOfZeroBytesOnBinaryBitcoinAddress += 1
+        binaryBitcoinAddress = binaryBitcoinAddress[1:]
+    base58encoded = arithmetic.changebase(binaryBitcoinAddress, 256, 58)
+    return "1" * numberOfZeroBytesOnBinaryBitcoinAddress + base58encoded

src/helper_bootstrap.py

@@ -0,0 +1,45 @@
+import shared
+import socket
+import defaultKnownNodes
+import pickle
+import time
+
+def knownNodes():
+    try:
+        # We shouldn't have to use the shared.knownNodesLock because this had
+        # better be the only thread accessing knownNodes right now.
+        pickleFile = open(shared.appdata + 'knownnodes.dat', 'rb')
+        shared.knownNodes = pickle.load(pickleFile)
+        pickleFile.close()
+    except:
+        defaultKnownNodes.createDefaultKnownNodes(shared.appdata)
+        pickleFile = open(shared.appdata + 'knownnodes.dat', 'rb')
+        shared.knownNodes = pickle.load(pickleFile)
+        pickleFile.close()
+    if shared.config.getint('bitmessagesettings', 'settingsversion') > 6:
+        print 'Bitmessage cannot read future versions of the keys file (keys.dat). Run the newer version of Bitmessage.'
+        raise SystemExit
+        
+
+def dns():
+    # DNS bootstrap. This could be programmed to use the SOCKS proxy to do the
+    # DNS lookup some day but for now we will just rely on the entries in
+    # defaultKnownNodes.py. Hopefully either they are up to date or the user
+    # has run Bitmessage recently without SOCKS turned on and received good
+    # bootstrap nodes using that method.
+    if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none':
+        try:
+            for item in socket.getaddrinfo('bootstrap8080.bitmessage.org', 80):
+                print 'Adding', item[4][0], 'to knownNodes based on DNS boostrap method'
+                shared.knownNodes[1][item[4][0]] = (8080, int(time.time()))
+        except:
+            print 'bootstrap8080.bitmessage.org DNS bootstraping failed.'
+        try:
+            for item in socket.getaddrinfo('bootstrap8444.bitmessage.org', 80):
+                print 'Adding', item[4][0], 'to knownNodes based on DNS boostrap method'
+                shared.knownNodes[1][item[4][0]] = (8444, int(time.time()))
+        except:
+            print 'bootstrap8444.bitmessage.org DNS bootstrapping failed.'
+    else:
+        print 'DNS bootstrap skipped because SOCKS is used.'
+        

src/helper_generic.py

@@ -0,0 +1,34 @@
+import shared
+import sys
+
+def convertIntToString(n):
+    a = __builtins__.hex(n)
+    if a[-1:] == 'L':
+        a = a[:-1]
+    if (len(a) % 2) == 0:
+        return a[2:].decode('hex')
+    else:
+        return ('0' + a[2:]).decode('hex')
+
+
+def convertStringToInt(s):
+    return int(s.encode('hex'), 16)
+
+
+def signal_handler(signal, frame):
+    if shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'):
+        shared.doCleanShutdown()
+        sys.exit(0)
+    else:
+        print 'Unfortunately you cannot use Ctrl+C when running the UI because the UI captures the signal.'
+
+def isHostInPrivateIPRange(host):
+    if host[:3] == '10.':
+        return True
+    if host[:4] == '172.':
+        if host[6] == '.':
+            if int(host[4:6]) >= 16 and int(host[4:6]) <= 31:
+                return True
+    if host[:8] == '192.168.':
+        return True
+    return False

src/helper_inbox.py

@@ -0,0 +1,22 @@
+import shared
+
+def insert(t):
+    shared.sqlLock.acquire()
+    shared.sqlSubmitQueue.put(
+        '''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''')
+    shared.sqlSubmitQueue.put(t)
+    shared.sqlReturnQueue.get()
+    shared.sqlSubmitQueue.put('commit')
+    shared.sqlLock.release()
+    
+def trash(msgid):
+    t = (msgid,)
+    shared.sqlLock.acquire()
+    shared.sqlSubmitQueue.put(
+        '''UPDATE inbox SET folder='trash' WHERE msgid=?''')
+    shared.sqlSubmitQueue.put(t)
+    shared.sqlReturnQueue.get()
+    shared.sqlSubmitQueue.put('commit')
+    shared.sqlLock.release()
+    shared.UISignalQueue.put(('removeInboxRowByMsgid',msgid))
+    

src/helper_sent.py

@@ -0,0 +1,11 @@
+import shared
+
+def insert(t):
+    shared.sqlLock.acquire()
+    shared.sqlSubmitQueue.put(
+        '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
+    shared.sqlSubmitQueue.put(t)
+    shared.sqlReturnQueue.get()
+    shared.sqlSubmitQueue.put('commit')
+    shared.sqlLock.release()
+    

src/helper_startup.py

@@ -0,0 +1,78 @@
+import shared
+import ConfigParser
+import sys
+import os
+
+storeConfigFilesInSameDirectoryAsProgramByDefault = False  # The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder.
+
+def loadConfig():
+    # First try to load the config file (the keys.dat file) from the program
+    # directory
+    shared.config.read('keys.dat')
+    try:
+        shared.config.get('bitmessagesettings', 'settingsversion')
+        print 'Loading config files from same directory as program'
+        shared.appdata = ''
+    except:
+        # Could not load the keys.dat file in the program directory. Perhaps it
+        # is in the appdata directory.
+        shared.appdata = shared.lookupAppdataFolder()
+        shared.config = ConfigParser.SafeConfigParser()
+        shared.config.read(shared.appdata + 'keys.dat')
+        try:
+            shared.config.get('bitmessagesettings', 'settingsversion')
+            print 'Loading existing config files from', shared.appdata
+        except:
+            # This appears to be the first time running the program; there is
+            # no config file (or it cannot be accessed). Create config file.
+            shared.config.add_section('bitmessagesettings')
+            shared.config.set('bitmessagesettings', 'settingsversion', '6')
+            shared.config.set('bitmessagesettings', 'port', '8444')
+            shared.config.set(
+                'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y  %%I:%%M %%p')
+            shared.config.set('bitmessagesettings', 'blackwhitelist', 'black')
+            shared.config.set('bitmessagesettings', 'startonlogon', 'false')
+            if 'linux' in sys.platform:
+                shared.config.set(
+                    'bitmessagesettings', 'minimizetotray', 'false')
+                                  # This isn't implimented yet and when True on
+                                  # Ubuntu causes Bitmessage to disappear while
+                                  # running when minimized.
+            else:
+                shared.config.set(
+                    'bitmessagesettings', 'minimizetotray', 'true')
+            shared.config.set(
+                'bitmessagesettings', 'showtraynotifications', 'true')
+            shared.config.set('bitmessagesettings', 'startintray', 'false')
+            shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
+            shared.config.set(
+                'bitmessagesettings', 'sockshostname', 'localhost')
+            shared.config.set('bitmessagesettings', 'socksport', '9050')
+            shared.config.set(
+                'bitmessagesettings', 'socksauthentication', 'false')
+            shared.config.set('bitmessagesettings', 'socksusername', '')
+            shared.config.set('bitmessagesettings', 'sockspassword', '')
+            shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
+            shared.config.set(
+                'bitmessagesettings', 'messagesencrypted', 'false')
+            shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
+                shared.networkDefaultProofOfWorkNonceTrialsPerByte))
+            shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
+                shared.networkDefaultPayloadLengthExtraBytes))
+            shared.config.set('bitmessagesettings', 'minimizeonclose', 'false')
+            shared.config.set(
+                'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
+            shared.config.set(
+                'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
+
+            if storeConfigFilesInSameDirectoryAsProgramByDefault:
+                # Just use the same directory as the program and forget about
+                # the appdata folder
+                shared.appdata = ''
+                print 'Creating new config files in same directory as program.'
+            else:
+                print 'Creating new config files in', shared.appdata
+                if not os.path.exists(shared.appdata):
+                    os.makedirs(shared.appdata)
+            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+                shared.config.write(configfile)

src/proofofwork.py

@@ -4,16 +4,17 @@
 import hashlib
 from struct import unpack, pack
 import sys
+from shared import config
 #import os
 
 def _set_idle():
     if 'linux' in sys.platform:
         import os
-        os.nice(20)
+        os.nice(20)  # @UndefinedVariable
     else:
         try:
             sys.getwindowsversion()
-            import win32api,win32process,win32con
+            import win32api,win32process,win32con  # @UnresolvedImport
             pid = win32api.GetCurrentProcessId()
             handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, True, pid)
             win32process.SetPriorityClass(handle, win32process.IDLE_PRIORITY_CLASS)

src/pyelliptic/openssl.py

@@ -289,7 +289,12 @@ class _OpenSSL:
         self.HMAC.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int,
                               ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p]
 
-        self.PKCS5_PBKDF2_HMAC = self._lib.PKCS5_PBKDF2_HMAC
+        try:
+            self.PKCS5_PBKDF2_HMAC = self._lib.PKCS5_PBKDF2_HMAC
+        except:
+            # The above is not compatible with all versions of OSX.
+            self.PKCS5_PBKDF2_HMAC = self._lib.PKCS5_PBKDF2_HMAC_SHA1
+            
         self.PKCS5_PBKDF2_HMAC.restype = ctypes.c_int
         self.PKCS5_PBKDF2_HMAC.argtypes = [ctypes.c_void_p, ctypes.c_int,
                                            ctypes.c_void_p, ctypes.c_int,
@@ -427,7 +432,7 @@ except:
                       lib_path = path.join(sys._MEIPASS, "libeay32.dll")
                       OpenSSL = _OpenSSL(lib_path)
                   except:
-                      if 'linux' in sys.platform or 'darwin' in sys.platform:
+                      if 'linux' in sys.platform or 'darwin' in sys.platform or 'freebsd' in sys.platform:
                           try:
                               from ctypes.util import find_library
                               OpenSSL = _OpenSSL(find_library('ssl'))

src/shared.py

@@ -1,4 +1,12 @@
-softwareVersion = '0.3.3-2'
+softwareVersion = '0.3.4'
+verbose = 1
+maximumAgeOfAnObjectThatIAmWillingToAccept = 216000  # Equals two days and 12 hours.
+lengthOfTimeToLeaveObjectsInInventory = 237600  # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.
+lengthOfTimeToHoldOnToAllPubkeys = 2419200  # Equals 4 weeks. You could make this longer if you want but making it shorter would not be advisable because there is a very small possibility that it could keep you from obtaining a needed pubkey for a period of time.
+maximumAgeOfObjectsThatIAdvertiseToOthers = 216000  # Equals two days and 12 hours
+maximumAgeOfNodesThatIAdvertiseToOthers = 10800  # Equals three hours
+useVeryEasyProofOfWorkForTesting = False  # If you set this to True while on the normal network, you won't be able to send or sometimes receive messages.
+
 
 import threading
 import sys
@@ -8,7 +16,15 @@ import Queue
 import pickle
 import os
 import time
+import ConfigParser
+import socket
+import random
+import highlevelcrypto
+import shared
+import helper_startup
 
+
+config = ConfigParser.SafeConfigParser()
 myECCryptorObjects = {}
 MyECSubscriptionCryptorObjects = {}
 myAddressesByHash = {} #The key in this dictionary is the RIPE hash which is encoded in an address and value is the address itself.
@@ -29,25 +45,99 @@ appdata = '' #holds the location of the application data storage directory
 statusIconColor = 'red'
 connectedHostsList = {} #List of hosts to which we are connected. Used to guarantee that the outgoingSynSender threads won't connect to the same remote node twice.
 shutdown = 0 #Set to 1 by the doCleanShutdown function. Used to tell the proof of work worker threads to exit.
+alreadyAttemptedConnectionsList = {
+}  # This is a list of nodes to which we have already attempted a connection
+alreadyAttemptedConnectionsListLock = threading.Lock()
+alreadyAttemptedConnectionsListResetTime = int(
+    time.time())  # used to clear out the alreadyAttemptedConnectionsList periodically so that we will retry connecting to hosts to which we have already tried to connect.
+numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer = {}
+neededPubkeys = {}
+eightBytesOfRandomDataUsedToDetectConnectionsToSelf = pack(
+    '>Q', random.randrange(1, 18446744073709551615))
+successfullyDecryptMessageTimings = [
+    ]  # A list of the amounts of time it took to successfully decrypt msg messages
+apiAddressGeneratorReturnQueue = Queue.Queue(
+    )  # The address generator thread uses this queue to get information back to the API thread.
+ackdataForWhichImWatching = {}
 
 #If changed, these values will cause particularly unexpected behavior: You won't be able to either send or receive messages because the proof of work you do (or demand) won't match that done or demanded by others. Don't change them!
 networkDefaultProofOfWorkNonceTrialsPerByte = 320 #The amount of work that should be performed (and demanded) per byte of the payload. Double this number to double the work.
 networkDefaultPayloadLengthExtraBytes = 14000 #To make sending short messages a little more difficult, this value is added to the payload length for use in calculating the proof of work target.
 
+def isInSqlInventory(hash):
+    t = (hash,)
+    shared.sqlLock.acquire()
+    shared.sqlSubmitQueue.put('''select hash from inventory where hash=?''')
+    shared.sqlSubmitQueue.put(t)
+    queryreturn = shared.sqlReturnQueue.get()
+    shared.sqlLock.release()
+    if queryreturn == []:
+        return False
+    else:
+        return True
+
+def assembleVersionMessage(remoteHost, remotePort, myStreamNumber):
+    payload = ''
+    payload += pack('>L', 2)  # protocol version.
+    payload += pack('>q', 1)  # bitflags of the services I offer.
+    payload += pack('>q', int(time.time()))
+
+    payload += pack(
+        '>q', 1)  # boolservices of remote connection. How can I even know this for sure? This is probably ignored by the remote host.
+    payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \
+        socket.inet_aton(remoteHost)
+    payload += pack('>H', remotePort)  # remote IPv6 and port
+
+    payload += pack('>q', 1)  # bitflags of the services I offer.
+    payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + pack(
+        '>L', 2130706433)  # = 127.0.0.1. This will be ignored by the remote host. The actual remote connected IP will be used.
+    payload += pack('>H', shared.config.getint(
+        'bitmessagesettings', 'port'))  # my external IPv6 and port
+
+    random.seed()
+    payload += eightBytesOfRandomDataUsedToDetectConnectionsToSelf
+    userAgent = '/PyBitmessage:' + shared.softwareVersion + \
+        '/'  # Length of userAgent must be less than 253.
+    payload += pack('>B', len(
+        userAgent))  # user agent string length. If the user agent is more than 252 bytes long, this code isn't going to work.
+    payload += userAgent
+    payload += encodeVarint(
+        1)  # The number of streams about which I care. PyBitmessage currently only supports 1 per connection.
+    payload += encodeVarint(myStreamNumber)
+
+    datatosend = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
+    datatosend = datatosend + 'version\x00\x00\x00\x00\x00'  # version command
+    datatosend = datatosend + pack('>L', len(payload))  # payload length
+    datatosend = datatosend + hashlib.sha512(payload).digest()[0:4]
+    return datatosend + payload
+
 def lookupAppdataFolder():
     APPNAME = "PyBitmessage"
     from os import path, environ
     if sys.platform == 'darwin':
         if "HOME" in environ:
-            dataFolder = path.join(os.environ["HOME"], "Library/Application support/", APPNAME) + '/'
+            dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/'
         else:
-            print 'Could not find home folder, please report this message and your OS X version to the BitMessage Github.'
+            logger.critical('Could not find home folder, please report this message and your '
+                             'OS X version to the BitMessage Github.')
             sys.exit()
 
     elif 'win32' in sys.platform or 'win64' in sys.platform:
         dataFolder = path.join(environ['APPDATA'], APPNAME) + '\\'
     else:
-        dataFolder = path.expanduser(path.join("~", "." + APPNAME + "/"))
+        from shutil import move
+        try:
+            dataFolder = path.join(environ["XDG_CONFIG_HOME"], APPNAME)
+        except KeyError:
+            dataFolder = path.join(environ["HOME"], ".config", APPNAME)
+
+        # Migrate existing data to the proper location if this is an existing install
+        try:
+            logger.info("Moving data folder to %s" % (dataFolder))
+            move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
+        except IOError:
+            pass
+        dataFolder = dataFolder + '/'
     return dataFolder
 
 def isAddressInMyAddressBook(address):
@@ -112,9 +202,7 @@ def decodeWalletImportFormat(WIFstring):
 
 
 def reloadMyAddressHashes():
-    printLock.acquire()
+    logger.debug('reloading keys from keys.dat file')
-    print 'reloading keys from keys.dat file'
-    printLock.release()
     myECCryptorObjects.clear()
     myAddressesByHash.clear()
     #myPrivateKeys.clear()
@@ -133,9 +221,7 @@ def reloadMyAddressHashes():
                     sys.stderr.write('Error in reloadMyAddressHashes: Can\'t handle address versions other than 2 or 3.\n')
 
 def reloadBroadcastSendersForWhichImWatching():
-    printLock.acquire()
+    logger.debug('reloading subscriptions...')
-    print 'reloading subscriptions...'
-    printLock.release()
     broadcastSendersForWhichImWatching.clear()
     MyECSubscriptionCryptorObjects.clear()
     sqlLock.acquire()
@@ -158,46 +244,44 @@ def doCleanShutdown():
     knownNodesLock.acquire()
     UISignalQueue.put(('updateStatusBar','Saving the knownNodes list of peers to disk...'))
     output = open(appdata + 'knownnodes.dat', 'wb')
-    print 'finished opening knownnodes.dat. Now pickle.dump'
+    logger.info('finished opening knownnodes.dat. Now pickle.dump')
     pickle.dump(knownNodes, output)
-    print 'Completed pickle.dump. Closing output...'
+    logger.info('Completed pickle.dump. Closing output...')
     output.close()
     knownNodesLock.release()
-    printLock.acquire()
+    logger.info('Finished closing knownnodes.dat output file.')
-    print 'Finished closing knownnodes.dat output file.'
-    printLock.release()
     UISignalQueue.put(('updateStatusBar','Done saving the knownNodes list of peers to disk.'))
 
     broadcastToSendDataQueues((0, 'shutdown', 'all'))
 
-    printLock.acquire()
+    logger.info('Flushing inventory in memory out to disk...')
-    print 'Flushing inventory in memory out to disk...'
+    UISignalQueue.put((
-    printLock.release()
+        'updateStatusBar',
-    UISignalQueue.put(('updateStatusBar','Flushing inventory in memory out to disk. This should normally only take a second...'))
+        'Flushing inventory in memory out to disk. This should normally only take a second...'))
     flushInventory()
 
-    #This one last useless query will guarantee that the previous flush committed before we close the program.
+    # This one last useless query will guarantee that the previous flush committed before we close
+    # the program.
     sqlLock.acquire()
     sqlSubmitQueue.put('SELECT address FROM subscriptions')
     sqlSubmitQueue.put('')
     sqlReturnQueue.get()
     sqlSubmitQueue.put('exit')
     sqlLock.release()
-    printLock.acquire()
+    logger.info('Finished flushing inventory.')
-    print 'Finished flushing inventory.'
+    # Wait long enough to guarantee that any running proof of work worker threads will check the
-    printLock.release()
+    # shutdown variable and exit. If the main thread closes before they do then they won't stop.
-
+    time.sleep(.25) 
-    time.sleep(.25) #Wait long enough to guarantee that any running proof of work worker threads will check the shutdown variable and exit. If the main thread closes before they do then they won't stop.
 
     if safeConfigGetBoolean('bitmessagesettings','daemon'):
-        printLock.acquire()
+        logger.info('Clean shutdown complete.')
-        print 'Done.'
-        printLock.release()
         os._exit(0)
 
-#When you want to command a sendDataThread to do something, like shutdown or send some data, this function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are responsible for putting their queue into (and out of) the sendDataQueues list.
+# When you want to command a sendDataThread to do something, like shutdown or send some data, this
+# function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are
+# responsible for putting their queue into (and out of) the sendDataQueues list.
 def broadcastToSendDataQueues(data):
-    #print 'running broadcastToSendDataQueues'
+    # logger.debug('running broadcastToSendDataQueues')
     for q in sendDataQueues:
         q.put((data))
         
@@ -221,3 +305,6 @@ def fixPotentiallyInvalidUTF8Data(text):
     except:
         output = 'Part of the message is corrupt. The message cannot be displayed the normal way.\n\n' + repr(text)
         return output
+
+helper_startup.loadConfig()
+from debug import logger

src/singleton.py

@@ -34,7 +34,7 @@ class singleinstance:
                 print(e.errno)
                 raise
         else:  # non Windows
-            import fcntl
+            import fcntl  # @UnresolvedImport
             self.fp = open(self.lockfile, 'w')
             try:
                 fcntl.lockf(self.fp, fcntl.LOCK_EX | fcntl.LOCK_NB)
@@ -53,7 +53,7 @@ class singleinstance:
                     os.close(self.fd)
                     os.unlink(self.lockfile)
             else:
-                import fcntl
+                import fcntl  # @UnresolvedImport
                 fcntl.lockf(self.fp, fcntl.LOCK_UN)
                 if os.path.isfile(self.lockfile):
                     os.unlink(self.lockfile)

src/tr.py

@@ -0,0 +1,30 @@
+import shared
+
+# This is used so that the translateText function can be used when we are in daemon mode and not using any QT functions.
+class translateClass:
+    def __init__(self, context, text):
+        self.context = context
+        self.text = text
+    def arg(self,argument):
+        if '%' in self.text:
+            return translateClass(self.context, self.text.replace('%','',1)) # This doesn't actually do anything with the arguments because we don't have a UI in which to display this information anyway.
+        else:
+            return self.text
+
+def _translate(context, text):
+    return translateText(context, text)
+
+def translateText(context, text):
+    if not shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'):
+        try:
+            from PyQt4 import QtCore, QtGui
+        except Exception as err:
+            print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download PyQt from http://www.riverbankcomputing.com/software/pyqt/download   or by searching Google for \'PyQt Download\'. If you want to run in daemon mode, see https://bitmessage.org/wiki/Daemon'
+            print 'Error message:', err
+            os._exit(0)
+        return QtGui.QApplication.translate(context, text)
+    else:
+        if '%' in text:
+            return translateClass(context, text.replace('%','',1))
+        else:
+            return text

src/translations/bitmessage_fr_BE.pro

@@ -1,21 +1,32 @@
-SOURCES	= 	../about.py\
+SOURCES	= 	../addresses.py\
-			../addresses.py\
-			../bitmessage_icons_rc.py\
 			../bitmessagemain.py\
+			../class_addressGenerator.py\
+			../class_outgoingSynSender.py\
+			../class_receiveDataThread.py\	
+			../class_sendDataThread.py\
+			../class_singleCleaner.py\
+			../class_singleListener.py\
+			../class_singleWorker.py\
+			../class_sqlThread.py\
+			../helper_bitcoin.py\
+			../helper_bootstrap.py\
+			../helper_generic.py\
+			../helper_inbox.py\
+			../helper_sent.py\
+			../helper_startup.py\
+			../shared.py
 			../bitmessageqt/__init__.py\
-			../bitmessageui.py\
+			../bitmessageqt/about.py\
-			../defaultKnownNodes.py\
+			../bitmessageqt/bitmessageui.py\
-			../help.py\
+			../bitmessageqt/help.py\
-			../highlevelcrypto.py\
+			../bitmessageqt/iconglossary.py\
-			../iconglossary.py\
+			../bitmessageqt/newaddressdialog.py\
-			../newaddressdialog.py\
+			../bitmessageqt/newchandialog.py\
-			../newsubscriptiondialog.py\
+			../bitmessageqt/newsubscriptiondialog.py\
-			../proofofwork.py\
+			../bitmessageqt/regenerateaddresses.py\
-			../regenerateaddresses.py\
+			../bitmessageqt/settings.py\
-			../settings.py\
+			../bitmessageqt/specialaddressbehavior.py
-			../shared.py\
+			
-			../singleton.py\
-			../specialaddressbehavior.py
 
 TRANSLATIONS	= bitmessage_fr_BE.ts