Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/proofofwork.py
	src/shared.py

Makefile

@@ -1,6 +1,6 @@
 APP=pybitmessage
-VERSION=0.3.1
+VERSION=0.3.2
-DEST_SHARE=/usr/share
+DEST_SHARE=$(DESTDIR)/usr/share
 DEST_APP=$(DEST_SHARE)/$(APP)
 
 all:
@@ -8,9 +8,10 @@ all:
 debug:
 
 source:
-	tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude=.git
+	tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude-vcs
 
 install:
+	mkdir -m 755 -p $(DESTDIR)/usr/bin
 	mkdir -m 755 -p $(DEST_APP)
 	mkdir -m 755 -p $(DEST_SHARE)/applications
 	mkdir -m 755 -p $(DEST_APP)/images
@@ -34,7 +35,7 @@ install:
 	install -m 644 src/pyelliptic/*.py $(DEST_APP)/pyelliptic
 	install -m 644 src/socks/*.py $(DEST_APP)/socks
 	install -m 644 src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt
-	install -m 755 debian/pybm /usr/bin/pybitmessage
+	install -m 755 debian/pybm $(DESTDIR)/usr/bin/$(APP)
 
 	install -m 644 desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP).desktop
 	install -m 644 src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png

debian.sh

@@ -7,15 +7,25 @@
 #!/bin/bash
 
 APP=pybitmessage
-VERSION=0.3.1
+PREV_VERSION=0.3.2
+VERSION=0.3.2
 ARCH_TYPE=all
 
+#update version numbers automatically - so you don't have to
+sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile
+sed -i 's/'''${PREV_VERSION}'''/'''${VERSION}'''/g' src/shared.py 
+
 # Create a source archive
 make clean
+# change the directory name to pybitmessage-version
+mv ../PyBitmessage ../${APP}-${VERSION}
 make source
 
 # Build the package
-fakeroot dpkg-buildpackage -A
+dpkg-buildpackage -A
+
+# change the directory name back
+mv ../${APP}-${VERSION} ../PyBitmessage
 
 gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb
 gpg -ba ../${APP}_${VERSION}.orig.tar.gz

debian/changelog

@@ -1,3 +1,74 @@
+pybitmessage (0.3.2-1) raring; urgency=low
+
+  * 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
+
+ -- Bob Mottram (4096 bits) <bob@robotics.uk.to>  Mon, 03 June 2013 20:17:00 +0100
+
+pybitmessage (0.3.1-1) raring; urgency=low
+
+  * 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
+
+ -- Jonathan Warren (4096 bits) <jonathan@bitmessage.org>  Sat, 25 May 2013 12:06:00 +0100
+
 pybitmessage (0.3.0-1) raring; urgency=low
 
   * Added new API function: getStatus

desktop/pybitmessage.desktop

@@ -7,12 +7,12 @@ Comment=Send encrypted messages to another person or to many subscribers
 Exec=pybitmessage %U
 Icon=pybitmessage
 Terminal=false
-Categories=Network;Email;Application
+Categories=Network;Email;Application;
-Keywords=Email;E-mail;Newsgroup;Messaging
+Keywords=Email;E-mail;Newsgroup;Messaging;
 X-MessagingMenu-UsesChatSection=true
 X-Ubuntu-Gettext-Domain=pybitmessage
 
-Actions=Send;Subscribe;AddressBook
+Actions=Send;Subscribe;AddressBook;
 
 [Desktop Action Send]
 Name=Send

src/bitmessagemain.py

@@ -21,7 +21,6 @@ import sys
 import ConfigParser
 import Queue
 from addresses import *
-#from shared import *
 import shared
 from defaultKnownNodes import *
 import time
@@ -322,19 +321,23 @@ class receiveDataThread(threading.Thread):
             #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
-            pass
+            return
-        elif self.data[0:4] != '\xe9\xbe\xb4\xd9':
+        if self.data[0:4] != '\xe9\xbe\xb4\xd9':
             if verbose >= 1:
                 shared.printLock.acquire()
                 sys.stderr.write('The magic bytes were not correct. First 40 bytes of data: %s\n' % repr(self.data[0:40]))
                 print 'self.data:', self.data.encode('hex')
                 shared.printLock.release()
             self.data = ""
-        else:
+            return
         self.payloadLength, = unpack('>L',self.data[16:20])
-            if len(self.data) >= self.payloadLength+24: #check if the whole message has arrived yet. If it has,...
+        if len(self.data) < self.payloadLength+24: #check if the whole message has arrived yet.
-                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...
+            return
-                    #print 'message checksum is correct'
+        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()
@@ -414,9 +417,8 @@ class receiveDataThread(threading.Thread):
             if len(self.ackDataThatWeHaveYetToSend) > 0:
                 self.data = self.ackDataThatWeHaveYetToSend.pop()
         self.processData()
-                else:
+
-                    print 'Checksum incorrect. Clearing this message.'
+
-                    self.data = self.data[self.payloadLength+24:]
 
     def isProofOfWorkSufficient(self,data,nonceTrialsPerByte=0,payloadLengthExtraBytes=0):
         if nonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte:
@@ -942,8 +944,7 @@ class receiveDataThread(threading.Thread):
             shared.sqlReturnQueue.get()
             shared.sqlSubmitQueue.put('commit')
             shared.sqlLock.release()
-            #self.emit(SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"),encryptedData[readPosition:],'Acknowledgement of the message received just now.')
+            shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(encryptedData[readPosition:],'Acknowledgement of the message received just now. '+ unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8'))))
-            shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(encryptedData[readPosition:],'Acknowledgement of the message received just now.')))
             return
         else:
             shared.printLock.acquire()
@@ -1153,7 +1154,7 @@ class receiveDataThread(threading.Thread):
 
                     #self.emit(SIGNAL("displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),toAddress,'[Broadcast subscribers]',fromAddress,subject,message,ackdata)
                     shared.UISignalQueue.put(('displayNewSentMessage',(toAddress,'[Broadcast subscribers]',fromAddress,subject,message,ackdata)))
-                    shared.workerQueue.put(('sendbroadcast',(fromAddress,subject,message)))
+                    shared.workerQueue.put(('sendbroadcast',''))
 
             if self.isAckDataValid(ackData):
                 print 'ackData is valid. Will process it.'
@@ -1505,12 +1506,18 @@ class receiveDataThread(threading.Thread):
 
     #We have received an inv message
     def recinv(self,data):
-        totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = 0
+        totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = 0 # ..from all peers, counting duplicates seperately (because they take up memory)
-        print 'number of keys(hosts) in numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer:', len(numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer)
+        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
@@ -2427,6 +2434,13 @@ class sqlThread(threading.Thread):
             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')
@@ -2538,7 +2552,6 @@ class singleCleaner(threading.Thread):
                     shared.sqlReturnQueue.get()
                     del shared.inventory[hash]
             shared.sqlSubmitQueue.put('commit')
-            #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),"")
             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.
@@ -2549,7 +2562,7 @@ class singleCleaner(threading.Thread):
                 timeWeLastClearedInventoryAndPubkeysTables = int(time.time())
                 #inventory (moves data from the inventory data structure to the on-disk sql database)
                 shared.sqlLock.acquire()
-                #inventory (clears data more than 2 days and 12 hours old)
+                #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)
@@ -2563,7 +2576,7 @@ class singleCleaner(threading.Thread):
                 shared.sqlSubmitQueue.put('commit')
 
                 t = ()
-                shared.sqlSubmitQueue.put('''select toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber FROM sent WHERE ((status='findingpubkey' OR status='sentmessage') AND folder='sent') ''') #If the message's folder='trash' then we'll ignore it.
+                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:
@@ -2574,28 +2587,31 @@ class singleCleaner(threading.Thread):
                         shared.printLock.release()
                         break
                     toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber = row
-                    if status == 'findingpubkey':
+                    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.workerQueue.put(('sendmessage',toaddress))
+                            
                             #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),"Doing work necessary to again attempt to request a public key...")
                             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=? WHERE toripe=?''')
+                            shared.sqlSubmitQueue.put('''UPDATE sent SET lastactiontime=?, pubkeyretrynumber=?, status='msgqueued' WHERE toripe=?''')
                             shared.sqlSubmitQueue.put(t)
                             shared.sqlReturnQueue.get()
-                    else:# status == sentmessage
+                            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,'findingpubkey',ackdata)
+                            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.workerQueue.put(('sendmessage',toaddress))
+                            shared.sqlSubmitQueue.put('commit')
+                            shared.workerQueue.put(('sendmessage',''))
                             #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),"Doing work necessary to again attempt to deliver a message...")
                             shared.UISignalQueue.put(('updateStatusBar','Doing work necessary to again attempt to deliver a message...'))
                 shared.sqlSubmitQueue.put('commit')
@@ -2609,85 +2625,45 @@ class singleWorker(threading.Thread):
         threading.Thread.__init__(self)
 
     def run(self):
-        time.sleep(10)
         shared.sqlLock.acquire()
-        shared.sqlSubmitQueue.put('''SELECT toripe FROM sent WHERE (status=? AND folder='sent')''')
+        shared.sqlSubmitQueue.put('''SELECT toripe FROM sent WHERE ((status='awaitingpubkey' OR status='doingpubkeypow') AND folder='sent')''')
-        shared.sqlSubmitQueue.put(('findingpubkey',))
+        shared.sqlSubmitQueue.put('')
         queryreturn = shared.sqlReturnQueue.get()
         shared.sqlLock.release()
         for row in queryreturn:
             toripe, = row
-            #It is possible for the status of a message in our sent folder (which is also our 'outbox' folder) to have a status of 'findingpubkey' even if we have the pubkey.  This can
-            #happen if the worker thread is working on the POW for an earlier message and does not get to the message in question before the user closes Bitmessage. In this case, the
-            #status will still be 'findingpubkey' but Bitmessage will never have checked to see whether it actually already has the pubkey. We should therefore check here.
-            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 pubkey then send the message otherwise put the hash in the neededPubkeys data structure so that we will pay attention to it if it comes over the wire.
-                self.sendMsg(toripe)
-            else:
             neededPubkeys[toripe] = 0
 
-        self.sendBroadcast() #just in case there are any proof of work tasks for Broadcasts that have yet to be sent.
+        #Initialize the ackdataForWhichImWatching data structure using data from the sql database.
-
-        #Now let us see if there are any proofs of work for msg messages that we have yet to complete..
         shared.sqlLock.acquire()
-        t = ('doingpow',)
+        shared.sqlSubmitQueue.put('''SELECT ackdata FROM sent where (status='msgsent' OR status='doingmsgpow')''')
-        shared.sqlSubmitQueue.put('''SELECT toripe FROM sent WHERE status=? and folder='sent' ''')
+        shared.sqlSubmitQueue.put('')
-        shared.sqlSubmitQueue.put(t)
         queryreturn = shared.sqlReturnQueue.get()
         shared.sqlLock.release()
         for row in queryreturn:
-            toripe, = row
+            ackdata,  = row
-            #Evidentially there is a remote possibility that we may, for some reason, no longer have the recipient's pubkey. Let us make sure we still have it or else the sendMsg function will appear to freeze.
+            print 'Watching for ackdata', ackdata.encode('hex')
+            ackdataForWhichImWatching[ackdata] = 0
+
         shared.sqlLock.acquire()
-            shared.sqlSubmitQueue.put('''SELECT hash FROM pubkeys WHERE hash=? ''')
+        shared.sqlSubmitQueue.put('''SELECT DISTINCT toaddress FROM sent WHERE (status='doingpubkeypow' AND folder='sent')''')
-            shared.sqlSubmitQueue.put((toripe,))
+        shared.sqlSubmitQueue.put('')
         queryreturn = shared.sqlReturnQueue.get()
         shared.sqlLock.release()
-            if queryreturn != []:
+        for row in queryreturn:
-                #We have the needed pubkey
+            toaddress, = row
-                self.sendMsg(toripe)
+            self.requestPubKey(toaddress)
-            else:
+        
-                shared.printLock.acquire()
+        time.sleep(10) #give some time for the GUI to start before we start on existing POW tasks.
-                sys.stderr.write('For some reason, the status of a message in our outbox is \'doingpow\' even though we lack the pubkey. Here is the RIPE hash of the needed pubkey: %s\n' % toripe.encode('hex'))
+
-                shared.printLock.release()
+        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()
-            #statusbar = 'The singleWorker thread is working on work.'
-            #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),statusbar)
             if command == 'sendmessage':
-                toAddress = data
+                self.sendMsg()
-                toStatus,toAddressVersionNumber,toStreamNumber,toRipe = decodeAddress(toAddress)
-                #print 'message type', type(message)
-                #print repr(message.toUtf8())
-                #print str(message.toUtf8())
-                shared.sqlLock.acquire()
-                shared.sqlSubmitQueue.put('SELECT hash FROM pubkeys WHERE hash=?')
-                shared.sqlSubmitQueue.put((toRipe,))
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlLock.release()
-                #print 'queryreturn', queryreturn
-                if queryreturn == []:
-                    #We'll need to request the pub key because we don't have it.
-                    if not toRipe in neededPubkeys:
-                        neededPubkeys[toRipe] = 0
-                        print 'requesting pubkey:', toRipe.encode('hex')
-                        self.requestPubKey(toAddressVersionNumber,toStreamNumber,toRipe)
-                    else:
-                        print 'We have already requested this pubkey (the ripe hash is in neededPubkeys). We will re-request again soon.'
-                        #self.emit(SIGNAL("updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"),toRipe,'Public key was requested earlier. Receiver must be offline. Will retry.')
-                        shared.UISignalQueue.put(('updateSentItemStatusByHash',(toRipe,'Public key was requested earlier. Receiver must be offline. Will retry.')))
-
-                else:
-                    print 'We already have the necessary public key.'
-                    self.sendMsg(toRipe) #by calling this function, we are asserting that we already have the pubkey for toRipe
             elif command == 'sendbroadcast':
-                print 'Within WorkerThread, processing sendbroadcast command.'
-                fromAddress,subject,message = data
                 self.sendBroadcast()
             elif command == 'doPOWForMyV2Pubkey':
                 self.doPOWForMyV2Pubkey(data)
@@ -2698,7 +2674,14 @@ class singleWorker(threading.Thread):
                 if toRipe in neededPubkeys:
                     print 'We have been awaiting the arrival of this pubkey.'
                     del neededPubkeys[toRipe]
-                    self.sendMsg(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')
@@ -2707,7 +2690,6 @@ class singleWorker(threading.Thread):
                 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
@@ -2890,7 +2872,7 @@ class singleWorker(threading.Thread):
                 inventoryHash = calculateInventoryHash(payload)
                 objectType = 'broadcast'
                 shared.inventory[inventoryHash] = (objectType, streamNumber, payload, int(time.time()))
-                print 'sending inv (within sendBroadcast function)'
+                print 'Broadcasting inv for my broadcast (within sendBroadcast function):', inventoryHash.encode('hex')
                 shared.broadcastToSendDataQueues((streamNumber, 'sendinv', inventoryHash))
 
                 #self.emit(SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"),ackdata,'Broadcast sent on '+unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8'))
@@ -2976,25 +2958,83 @@ class singleWorker(threading.Thread):
                 sys.stderr.write('Error: In the singleWorker thread, the sendBroadcast function doesn\'t understand the address version.\n')
                 shared.printLock.release()
 
-    def sendMsg(self,toRipe):
+    def sendMsg(self):
+        #Check to see if there are any messages queued to be sent
         shared.sqlLock.acquire()
-        t = ('doingpow','findingpubkey',toRipe)
+        shared.sqlSubmitQueue.put('''SELECT DISTINCT toaddress FROM sent WHERE (status='msgqueued' AND folder='sent')''')
-        shared.sqlSubmitQueue.put('''UPDATE sent SET status=? WHERE status=? AND toripe=? and folder='sent' ''')
+        shared.sqlSubmitQueue.put('')
-        shared.sqlSubmitQueue.put(t)
         queryreturn = shared.sqlReturnQueue.get()
-        shared.sqlSubmitQueue.put('commit')
+        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.
-        t = ('doingpow',toRipe)
+            toaddress, = row
-        shared.sqlSubmitQueue.put('''SELECT toaddress, fromaddress, subject, message, ackdata FROM sent WHERE status=? AND toripe=? and folder='sent' ''')
+            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,'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,'Sending a request for the recipient\'s encryption key.')))
+                    self.requestPubKey(toaddress)
+        shared.sqlLock.acquire()
+        shared.sqlSubmitQueue.put('''SELECT toaddress, toripe, fromaddress, subject, message, ackdata FROM sent WHERE status='doingmsgpow' and folder='sent' ''')
+        shared.sqlSubmitQueue.put('')
         queryreturn = shared.sqlReturnQueue.get()
         shared.sqlLock.release()
         for row in queryreturn:
-            toaddress, fromaddress, subject, message, ackdata = row
+            toaddress, toripe, fromaddress, subject, message, ackdata = row
+
+            #Evidently 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.
+            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 == []:
+                #We no longer have the needed pubkey
+                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,'Sending a request for the recipient\'s encryption key.')))
+                self.requestPubKey(toaddress)
+                return
             ackdataForWhichImWatching[ackdata] = 0
             toStatus,toAddressVersionNumber,toStreamNumber,toHash = decodeAddress(toaddress)
             fromStatus,fromAddressVersionNumber,fromStreamNumber,fromHash = decodeAddress(fromaddress)
-            #self.emit(SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"),ackdata,'Doing work necessary to send the message.')
             shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Doing work necessary to send the message.')))
             shared.printLock.acquire()
             print 'Found a message in our database that needs to be sent with this pubkey.'
@@ -3086,7 +3126,7 @@ class singleWorker(threading.Thread):
             if toAddressVersionNumber == 2 or toAddressVersionNumber == 3:
                 shared.sqlLock.acquire()
                 shared.sqlSubmitQueue.put('SELECT transmitdata FROM pubkeys WHERE hash=?')
-                shared.sqlSubmitQueue.put((toRipe,))
+                shared.sqlSubmitQueue.put((toripe,))
                 queryreturn = shared.sqlReturnQueue.get()
                 shared.sqlLock.release()
                 if queryreturn == []:
@@ -3121,6 +3161,7 @@ class singleWorker(threading.Thread):
                         requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
                     if requiredPayloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes:
                         requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
+                    #todo: pull yet-to-be-added values out of config: maximumacceptabletotaldifficult and maximumacceptablesmallmessagedifficulty and compare.
                 encrypted = highlevelcrypto.encrypt(payload,"04"+pubEncryptionKeyBase256.encode('hex'))
 
             #We are now dropping the unencrypted data in payload since it has already been encrypted and replacing it with the encrypted payload that we will send out.
@@ -3144,17 +3185,17 @@ class singleWorker(threading.Thread):
             shared.inventory[inventoryHash] = (objectType, toStreamNumber, payload, int(time.time()))
             #self.emit(SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"),ackdata,'Message sent. Waiting on acknowledgement. Sent on ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8'))
             shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Message sent. Waiting on acknowledgement. Sent on ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8'))))
-            print 'sending inv (within sendmsg function)'
+            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 'sent' status
             shared.sqlLock.acquire()
-            t = ('sentmessage',toaddress, fromaddress, subject, message,'doingpow')
+            t = ('msgsent',toaddress, fromaddress, subject, message,'doingmsgpow')
             shared.sqlSubmitQueue.put('UPDATE sent SET status=? WHERE toaddress=? AND fromaddress=? AND subject=? AND message=? AND status=?')
             shared.sqlSubmitQueue.put(t)
             queryreturn = shared.sqlReturnQueue.get()
 
-            t = (toRipe,)
+            t = (toripe,)
             shared.sqlSubmitQueue.put('''UPDATE pubkeys SET usedpersonally='yes' WHERE hash=?''')
             shared.sqlSubmitQueue.put(t)
             queryreturn = shared.sqlReturnQueue.get()
@@ -3162,7 +3203,14 @@ class singleWorker(threading.Thread):
             shared.sqlLock.release()
 
 
-    def requestPubKey(self,addressVersionNumber,streamNumber,ripe):
+    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('>I',(int(time.time())+random.randrange(-300, 300)))#the current time plus or minus five minutes.
         payload += encodeVarint(addressVersionNumber)
         payload += encodeVarint(streamNumber)
@@ -3172,10 +3220,8 @@ class singleWorker(threading.Thread):
         shared.printLock.release()
         #print 'trial value', trialValue
         statusbar = 'Doing the computations necessary to request the recipient\'s public key.'
-        #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),statusbar)
         shared.UISignalQueue.put(('updateStatusBar',statusbar))
-        #self.emit(SIGNAL("updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"),ripe,'Doing work necessary to request public key.')
+        shared.UISignalQueue.put(('updateSentItemStatusByHash',(ripe,'Doing work necessary to request encryption key.')))
-        shared.UISignalQueue.put(('updateSentItemStatusByHash',(ripe,'Doing work necessary to request public key.')))
         print 'Doing proof-of-work necessary to send getpubkey message.'
         target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte)
         initialHash = hashlib.sha512(payload).digest()
@@ -3191,9 +3237,15 @@ class singleWorker(threading.Thread):
         print 'sending inv (for the getpubkey message)'
         shared.broadcastToSendDataQueues((streamNumber, 'sendinv', inventoryHash))
 
-        #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),'Broacasting the public key request. This program will auto-retry if they are offline.')
+        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','Broacasting the public key request. This program will auto-retry if they are offline.'))
-        #self.emit(SIGNAL("updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"),ripe,'Sending public key request. Waiting for reply. Requested at ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8'))
         shared.UISignalQueue.put(('updateSentItemStatusByHash',(ripe,'Sending public key request. Waiting for reply. Requested at ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8'))))
 
     def generateFullAckMessage(self,ackdata,toStreamNumber,embeddedTime):
@@ -3697,7 +3749,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
 
             ackdata = OpenSSL.rand(32)
             shared.sqlLock.acquire()
-            t = ('',toAddress,toRipe,fromAddress,subject,message,ackdata,int(time.time()),'findingpubkey',1,1,'sent',2)
+            t = ('',toAddress,toRipe,fromAddress,subject,message,ackdata,int(time.time()),'msgqueued',1,1,'sent',2)
             shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
             shared.sqlSubmitQueue.put(t)
             shared.sqlReturnQueue.get()
@@ -3771,7 +3823,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             #apiSignalQueue.put(('displayNewSentMessage',(toAddress,toLabel,fromAddress,subject,message,ackdata)))
             #self.emit(SIGNAL("displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),toAddress,toLabel,fromAddress,subject,message,ackdata)
             shared.UISignalQueue.put(('displayNewSentMessage',(toAddress,toLabel,fromAddress,subject,message,ackdata)))
-            shared.workerQueue.put(('sendbroadcast',(fromAddress,subject,message)))
+            shared.workerQueue.put(('sendbroadcast',''))
 
             return ackdata.encode('hex')         
         elif method == 'getStatus':
@@ -3786,19 +3838,10 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             queryreturn = shared.sqlReturnQueue.get()
             shared.sqlLock.release()
             if queryreturn == []:
-                return 'notFound'
+                return 'notfound'
             for row in queryreturn:
                 status, = row
-                if status == 'findingpubkey':
+                return status
-                    return 'findingPubkey'
-                if status == 'doingpow':
-                    return 'doingPow'
-                if status == 'sentmessage':
-                    return 'sentMessage'
-                if status == 'ackreceived':
-                    return 'ackReceived'
-                else:
-                    return 'otherStatus: '+status
         elif method == 'addSubscription':
             if len(params) == 0:
                 return 'API Error 0000: I need parameters!'
@@ -4027,15 +4070,6 @@ if __name__ == "__main__":
     shared.reloadMyAddressHashes()
     shared.reloadBroadcastSendersForWhichImWatching()
 
-    #Initialize the ackdataForWhichImWatching data structure using data from the sql database.
-    shared.sqlSubmitQueue.put('''SELECT ackdata FROM sent where (status='sentmessage' OR status='doingpow')''')
-    shared.sqlSubmitQueue.put('')
-    queryreturn = shared.sqlReturnQueue.get()
-    for row in queryreturn:
-        ackdata,  = row
-        print 'Watching for ackdata', ackdata.encode('hex')
-        ackdataForWhichImWatching[ackdata] = 0
-
     if shared.safeConfigGetBoolean('bitmessagesettings','apienabled'):
         try:
             apiNotifyPath = shared.config.get('bitmessagesettings','apinotifypath')

src/bitmessageqt/__init__.py

@@ -71,17 +71,6 @@ class MyForm(QtGui.QMainWindow):
             #startup for linux
             pass
 
-        """self.trayIcon = QtGui.QSystemTrayIcon(self)
-        self.trayIcon.setIcon( QtGui.QIcon(':/newPrefix/images/can-icon-16px.png') )
-        traySignal = "activated(QSystemTrayIcon::ActivationReason)"
-        QtCore.QObject.connect(self.trayIcon, QtCore.SIGNAL(traySignal), self.__icon_activated)
-        menu = QtGui.QMenu()
-        self.exitAction = menu.addAction("Quit", self.quit)
-        self.trayIcon.setContextMenu(menu)
-        #I'm currently under the impression that Mac users have different expectations for the tray icon. They don't necessairly expect it to open the main window when clicked and they still expect a program showing a tray icon to also be in the dock.
-        if 'darwin' in sys.platform:
-            self.trayIcon.show()"""
-
         self.ui.labelSendBroadcastWarning.setVisible(False)
 
         #FILE MENU and other buttons
@@ -358,16 +347,20 @@ class MyForm(QtGui.QMainWindow):
             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 == 'findingpubkey':
+            if status == 'awaitingpubkey':
-                newItem =  myTableWidgetItem('Waiting on their public key. Will request it again soon.')
+                newItem =  myTableWidgetItem('Waiting on their encryption key. Will request it again soon.')
-            elif status == 'sentmessage':
+            elif status == 'doingpowforpubkey':
+                newItem =  myTableWidgetItem('Encryption key request queued.')
+            elif status == 'msgqueued':
+                newItem =  myTableWidgetItem('Queued.')
+            elif status == 'msgsent':
                 newItem =  myTableWidgetItem('Message sent. Waiting on acknowledgement. Sent at ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(lastactiontime)),'utf-8'))
-            elif status == 'doingpow':
+            elif status == 'doingmsgpow':
                 newItem =  myTableWidgetItem('Need to do work to send message. Work is queued.')
             elif status == 'ackreceived':
                 newItem =  myTableWidgetItem('Acknowledgement of the message received ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(lastactiontime))),'utf-8'))
-            elif status == 'broadcastpending':
+            elif status == 'broadcastqueued':
-                newItem =  myTableWidgetItem('Doing the work necessary to send broadcast...')
+                newItem =  myTableWidgetItem('Broadcast queued.')
             elif status == 'broadcastsent':
                 newItem =  myTableWidgetItem('Broadcast on ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(lastactiontime))),'utf-8'))
             else:
@@ -536,7 +529,7 @@ class MyForm(QtGui.QMainWindow):
 
     # create application indicator
     def appIndicatorInit(self,app):
-        self.tray = QSystemTrayIcon(QtGui.QIcon("images/can-icon-24px-red.png"), app)
+        self.tray = QSystemTrayIcon(QtGui.QIcon(":/newPrefix/images/can-icon-24px-red.png"), app)
         if sys.platform[0:3] == 'win':
             traySignal = "activated(QSystemTrayIcon::ActivationReason)"
             QtCore.QObject.connect(self.tray, QtCore.SIGNAL(traySignal), self.__icon_activated)
@@ -770,6 +763,7 @@ class MyForm(QtGui.QMainWindow):
     def click_actionDeleteAllTrashedMessages(self):
         if QtGui.QMessageBox.question(self, 'Delete trash?',"Are you sure you want to delete all trashed messages?", QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) == QtGui.QMessageBox.No:
             return
+        self.statusBar().showMessage('Deleting messages and freeing empty space...')
         shared.sqlLock.acquire()
         shared.sqlSubmitQueue.put('''delete from inbox where folder='trash' ''')
         shared.sqlSubmitQueue.put('')
@@ -781,6 +775,7 @@ class MyForm(QtGui.QMainWindow):
         shared.sqlSubmitQueue.put('vacuum')
         shared.sqlSubmitQueue.put('')
         shared.sqlReturnQueue.get()
+        self.statusBar().showMessage('')
         shared.sqlLock.release()
 
     def click_actionRegenerateDeterministicAddresses(self):
@@ -825,23 +820,6 @@ class MyForm(QtGui.QMainWindow):
             self.actionShow.setChecked(not self.actionShow.isChecked())
             self.appIndicatorShowOrHideWindow()
 
-            """if 'linux' in sys.platform:
-                self.trayIcon.hide()
-                self.setWindowFlags(Qt.Window)
-                self.show()
-            elif 'win32' in sys.platform or 'win64' in sys.platform:
-                self.trayIcon.hide()
-                self.setWindowFlags(Qt.Window)
-                self.show()
-                self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
-                self.activateWindow()
-            elif 'darwin' in sys.platform:
-                #self.trayIcon.hide() #this line causes a segmentation fault
-                #self.setWindowFlags(Qt.Window)
-                #self.show()
-                self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
-                self.activateWindow()"""
-
     def incrementNumberOfMessagesProcessed(self):
         self.numberOfMessagesProcessed += 1
         self.ui.labelMessageCount.setText('Processed ' + str(self.numberOfMessagesProcessed) + ' person-to-person messages.')
@@ -916,7 +894,6 @@ class MyForm(QtGui.QMainWindow):
             if self.actionStatus != None:
                 self.actionStatus.setText('Not Connected')
                 self.tray.setIcon(QtGui.QIcon(":/newPrefix/images/can-icon-24px-red.png"))
-                #self.trayIcon.show()
         if color == 'yellow':
             if self.statusBar().currentMessage() == 'Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.':
                 self.statusBar().showMessage('')
@@ -1104,7 +1081,7 @@ class MyForm(QtGui.QMainWindow):
                             self.statusBar().showMessage('Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.')
                         ackdata = OpenSSL.rand(32)
                         shared.sqlLock.acquire()
-                        t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'findingpubkey',1,1,'sent',2)
+                        t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'msgqueued',1,1,'sent',2)
                         shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
                         shared.sqlSubmitQueue.put(t)
                         shared.sqlReturnQueue.get()
@@ -1151,7 +1128,7 @@ class MyForm(QtGui.QMainWindow):
                 shared.sqlSubmitQueue.put('commit')
                 shared.sqlLock.release()
 
-                shared.workerQueue.put(('sendbroadcast',(fromAddress,subject,message)))
+                shared.workerQueue.put(('sendbroadcast',''))
 
                 try:
                     fromLabel = shared.config.get(fromAddress, 'label')
@@ -1454,6 +1431,10 @@ class MyForm(QtGui.QMainWindow):
                 shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte',str(int(float(self.settingsDialogInstance.ui.lineEditTotalDifficulty.text())*shared.networkDefaultProofOfWorkNonceTrialsPerByte)))
             if float(self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text()) >= 1:
                 shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes',str(int(float(self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text())*shared.networkDefaultPayloadLengthExtraBytes)))
+            #if str(self.settingsDialogInstance.ui.comboBoxMaxCores.currentText()) == 'All':
+            #    shared.config.set('bitmessagesettings', 'maxcores', '99999')
+            #else:
+            #    shared.config.set('bitmessagesettings', 'maxcores', str(self.settingsDialogInstance.ui.comboBoxMaxCores.currentText()))
 
             with open(shared.appdata + 'keys.dat', 'wb') as configfile:
                 shared.config.write(configfile)
@@ -1640,7 +1621,6 @@ class MyForm(QtGui.QMainWindow):
         # unregister the messaging system
         if self.mmapp is not None:
             self.mmapp.unregister()
-        #self.trayIcon.hide()
         self.statusBar().showMessage('All done. Closing user interface...')
         os._exit(0)
 
@@ -2129,12 +2109,10 @@ class settingsDialog(QtGui.QDialog):
             self.ui.checkBoxStartOnLogon.setDisabled(True)
             self.ui.checkBoxMinimizeToTray.setDisabled(True)
             self.ui.checkBoxShowTrayNotifications.setDisabled(True)
-            self.ui.checkBoxStartInTray.setDisabled(True)
             self.ui.labelSettingsNote.setText('Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system.')
         elif 'linux' in sys.platform:
             self.ui.checkBoxStartOnLogon.setDisabled(True)
             self.ui.checkBoxMinimizeToTray.setDisabled(True)
-            self.ui.checkBoxStartInTray.setDisabled(True)
             self.ui.labelSettingsNote.setText('Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system.')
         #On the Network settings tab:
         self.ui.lineEditTCPPort.setText(str(shared.config.get('bitmessagesettings', 'port')))
@@ -2161,6 +2139,25 @@ class settingsDialog(QtGui.QDialog):
 
         self.ui.lineEditTotalDifficulty.setText(str((float(shared.config.getint('bitmessagesettings', 'defaultnoncetrialsperbyte'))/shared.networkDefaultProofOfWorkNonceTrialsPerByte)))
         self.ui.lineEditSmallMessageDifficulty.setText(str((float(shared.config.getint('bitmessagesettings', 'defaultpayloadlengthextrabytes'))/shared.networkDefaultPayloadLengthExtraBytes)))
+
+        #'System' tab removed for now.
+        """try:
+            maxCores = shared.config.getint('bitmessagesettings', 'maxcores')
+        except:
+            maxCores = 99999
+        if maxCores <= 1:
+            self.ui.comboBoxMaxCores.setCurrentIndex(0)
+        elif maxCores == 2:
+            self.ui.comboBoxMaxCores.setCurrentIndex(1)
+        elif maxCores <= 4:
+            self.ui.comboBoxMaxCores.setCurrentIndex(2)
+        elif maxCores <= 8:
+            self.ui.comboBoxMaxCores.setCurrentIndex(3)
+        elif maxCores <= 16:
+            self.ui.comboBoxMaxCores.setCurrentIndex(4)
+        else:
+            self.ui.comboBoxMaxCores.setCurrentIndex(5)"""
+
         QtGui.QWidget.resize(self,QtGui.QWidget.sizeHint(self))
 
     def comboBoxProxyTypeChanged(self,comboBoxIndex):
@@ -2302,12 +2299,7 @@ def run():
     app.setStyleSheet("QStatusBar::item { border: 0px solid black }")
     myapp = MyForm()
 
-    if shared.config.getboolean('bitmessagesettings', 'startintray'):
+    if not shared.config.getboolean('bitmessagesettings', 'startintray'):
-        if not myapp.isUbuntu():
-            myapp.trayIcon.show()
-            if 'win32' in sys.platform or 'win64' in sys.platform:
-                myapp.setWindowFlags(Qt.ToolTip)
-    else:
         myapp.show()
 
     myapp.appIndicatorInit(app)

src/proofofwork.py

@@ -1,5 +1,12 @@
+#import shared
+#import time
+#from multiprocessing import Pool, cpu_count
+import hashlib
+from struct import unpack, pack
+#import sys
+#import os
+
 def _set_idle():
-    import sys
     try:
         sys.getwindowsversion()
         import win32api,win32process,win32con
@@ -7,14 +14,14 @@ def _set_idle():
         handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, True, pid)
         win32process.SetPriorityClass(handle, win32process.IDLE_PRIORITY_CLASS)
     except:
-        import os
+        try:
+            #Linux
             os.nice(20)
+        except:
+            #Windows 64-bit
+            pass
 
 def _pool_worker(nonce, initialHash, target, pool_size):
-    import hashlib
-    import sys
-    import os
-    from struct import unpack, pack
     _set_idle()
     trialValue = 99999999999999999999
     while trialValue > target:
@@ -23,20 +30,37 @@ def _pool_worker(nonce, initialHash, target, pool_size):
     return [trialValue, nonce]
 
 def run(target, initialHash):
-    from multiprocessing import Pool, cpu_count
+    nonce = 0
-    import time
+    trialValue = 99999999999999999999
-    try:
+    while trialValue > target:
+        nonce += 1
+        trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8])
+    return [trialValue, nonce]
+    """try:
         pool_size = cpu_count()
     except:
         pool_size = 4
+
+    try:
+        maxCores = config.getint('bitmessagesettings', 'maxcores')
+    except:
+        maxCores = 99999
+    if pool_size > maxCores:
+        pool_size = maxCores
+
     pool = Pool(processes=pool_size)
     result = []
     for i in range(pool_size):
         result.append(pool.apply_async(_pool_worker, args = (i, initialHash, target, pool_size)))
     while True:
+        if shared.shutdown:
+            pool.terminate()
+            time.sleep(5) #Don't return anything (doing so will cause exceptions because we'll return an unusable response). Sit here and wait for this thread to close.
+            return
         for i in range(pool_size):
             if result[i].ready():
                 result = result[i].get()
                 pool.terminate()
                 return result[0], result[1]
-      time.sleep(1)
+        time.sleep(0.2)"""
+

src/settings.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'settings.ui'
 #
-# Created: Sat May 25 13:20:18 2013
+# Created: Mon Jun 03 23:09:01 2013
 #      by: PyQt4 UI code generator 4.9.5
 #
 # WARNING! All changes made in this file will be lost!

src/shared.py

@@ -1,4 +1,4 @@
-softwareVersion = '0.3.1'
+softwareVersion = '0.3.211'
 
 import threading
 import sys
@@ -7,7 +7,7 @@ import highlevelcrypto
 import Queue
 import pickle
 import os
-import signal
+import time
 
 myECCryptorObjects = {}
 MyECSubscriptionCryptorObjects = {}
@@ -28,6 +28,7 @@ printLock = threading.Lock()
 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.
 
 #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.
@@ -142,6 +143,8 @@ def reloadBroadcastSendersForWhichImWatching():
         MyECSubscriptionCryptorObjects[hash] = highlevelcrypto.makeCryptor(privEncryptionKey.encode('hex'))
 
 def doCleanShutdown():
+    global shutdown
+    shutdown = 1 #Used to tell proof of work worker threads to exit.    
     knownNodesLock.acquire()
     UISignalQueue.put(('updateStatusBar','Saving the knownNodes list of peers to disk...'))
     output = open(appdata + 'knownnodes.dat', 'wb')
@@ -174,11 +177,7 @@ def doCleanShutdown():
     print 'Finished flushing inventory.'
     printLock.release()
 
-    #Messy hack to kill child processes immediately. May not work on all platforms.
+    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.
-    try:
-      os.killpg(os.getpgid(os.getpid()), signal.SIGTERM)
-    except:
-      os.kill(os.getpid(), signal.SIGTERM)
 
     if safeConfigGetBoolean('bitmessagesettings','daemon'):
         printLock.acquire()