From 128c6916af07c62cc7b3f6bdae5097475a057e8f Mon Sep 17 00:00:00 2001 From: Arceliar Date: Wed, 29 May 2013 22:01:12 +0200 Subject: [PATCH 1/3] Moved proof of work to child processes. --- src/bitmessagemain.py | 45 +++++++++---------------------------------- src/proofofwork.py | 28 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 src/proofofwork.py diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 110b4921..eab5fe0c 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -47,6 +47,7 @@ from SimpleXMLRPCServer import * import json from subprocess import call #used when the API must execute an outside program import singleton +import proofofwork #For each stream to which we connect, several outgoingSynSender threads will exist and will collectively create 8 connections with peers. class outgoingSynSender(threading.Thread): @@ -2744,16 +2745,12 @@ class singleWorker(threading.Thread): payload += pubEncryptionKey[1:] #Do the POW for this pubkey message - nonce = 0 - trialValue = 99999999999999999999 target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For pubkey message) Doing proof of work...' initialHash = hashlib.sha512(payload).digest() - while trialValue > target: - nonce += 1 - trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) + trialValue, nonce = proofofwork.run(target, initialHash) print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce - + trialValue, nonce = proofofwork.run(target, initialHash) payload = pack('>Q',nonce) + payload """t = (hash,payload,embeddedTime,'no') shared.sqlLock.acquire() @@ -2810,14 +2807,10 @@ class singleWorker(threading.Thread): payload += signature #Do the POW for this pubkey message - nonce = 0 - trialValue = 99999999999999999999 target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For pubkey message) Doing proof of work...' initialHash = hashlib.sha512(payload).digest() - while trialValue > target: - nonce += 1 - trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) + trialValue, nonce = proofofwork.run(target, initialHash) print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce payload = pack('>Q',nonce) + payload @@ -2885,16 +2878,12 @@ class singleWorker(threading.Thread): payload += encodeVarint(len(signature)) payload += signature - nonce = 0 - trialValue = 99999999999999999999 target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For broadcast message) Doing proof of work...' #self.emit(SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"),ackdata,'Doing work necessary to send broadcast...') shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Doing work necessary to send broadcast...'))) initialHash = hashlib.sha512(payload).digest() - while trialValue > target: - nonce += 1 - trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) + trialValue, nonce = proofofwork.run(target, initialHash) print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce payload = pack('>Q',nonce) + payload @@ -2956,16 +2945,12 @@ class singleWorker(threading.Thread): pubEncryptionKey = pointMult(privEncryptionKey) payload += highlevelcrypto.encrypt(dataToEncrypt,pubEncryptionKey.encode('hex')) - nonce = 0 - trialValue = 99999999999999999999 target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For broadcast message) Doing proof of work...' #self.emit(SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"),ackdata,'Doing work necessary to send broadcast...') shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Doing work necessary to send broadcast...'))) initialHash = hashlib.sha512(payload).digest() - while trialValue > target: - nonce += 1 - trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) + trialValue, nonce = proofofwork.run(target, initialHash) print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce payload = pack('>Q',nonce) + payload @@ -3139,8 +3124,6 @@ class singleWorker(threading.Thread): requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes encrypted = highlevelcrypto.encrypt(payload,"04"+pubEncryptionKeyBase256.encode('hex')) - nonce = 0 - trialValue = 99999999999999999999 #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. payload = embeddedTime + encodeVarint(toStreamNumber) + encrypted target = 2**64 / ((len(payload)+requiredPayloadLengthExtraBytes+8) * requiredAverageProofOfWorkNonceTrialsPerByte) @@ -3149,9 +3132,7 @@ class singleWorker(threading.Thread): shared.printLock.release() powStartTime = time.time() initialHash = hashlib.sha512(payload).digest() - while trialValue > target: - nonce += 1 - trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) + trialValue, nonce = proofofwork.run(target, initialHash) 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.' @@ -3190,8 +3171,6 @@ class singleWorker(threading.Thread): shared.printLock.acquire() print 'making request for pubkey with ripe:', ripe.encode('hex') shared.printLock.release() - nonce = 0 - trialValue = 99999999999999999999 #print 'trial value', trialValue statusbar = 'Doing the computations necessary to request the recipient\'s public key.' #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),statusbar) @@ -3201,9 +3180,7 @@ class singleWorker(threading.Thread): 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() - while trialValue > target: - nonce += 1 - trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) + trialValue, nonce = proofofwork.run(target, initialHash) shared.printLock.acquire() print 'Found proof of work', trialValue, 'Nonce:', nonce shared.printLock.release() @@ -3221,8 +3198,6 @@ class singleWorker(threading.Thread): 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): - nonce = 0 - trialValue = 99999999999999999999 payload = embeddedTime + encodeVarint(toStreamNumber) + ackdata target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) shared.printLock.acquire() @@ -3230,9 +3205,7 @@ class singleWorker(threading.Thread): shared.printLock.release() powStartTime = time.time() initialHash = hashlib.sha512(payload).digest() - while trialValue > target: - nonce += 1 - trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) + trialValue, nonce = proofofwork.run(target, initialHash) shared.printLock.acquire() print '(For ack message) Found proof of work', trialValue, 'Nonce:', nonce try: diff --git a/src/proofofwork.py b/src/proofofwork.py new file mode 100644 index 00000000..9054e0f5 --- /dev/null +++ b/src/proofofwork.py @@ -0,0 +1,28 @@ +def _pool_worker(nonce, initialHash, target, pool_size): + import hashlib + from struct import unpack, pack + trialValue = 99999999999999999999 + while trialValue > target: + nonce += pool_size + trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) + return [trialValue, nonce] + +def run(target, initialHash): + from multiprocessing import Pool, cpu_count + import time + try: + pool_size = cpu_count() + except: + pool_size = 4 + 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: + for counter in range(pool_size): + if result[counter].ready(): + result = result[counter].get() + pool.terminate() + return result[0], result[1] + time.sleep(1) + From 651cdd6357e1531da0ede2a06c808357a129a4d8 Mon Sep 17 00:00:00 2001 From: Arceliar Date: Wed, 29 May 2013 22:39:51 +0200 Subject: [PATCH 2/3] Fixed double PoW on pubkey messages. --- src/bitmessagemain.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index eab5fe0c..f8b85acf 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -2750,7 +2750,6 @@ class singleWorker(threading.Thread): initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce - trialValue, nonce = proofofwork.run(target, initialHash) payload = pack('>Q',nonce) + payload """t = (hash,payload,embeddedTime,'no') shared.sqlLock.acquire() From 42a446748d2800fc7dedd4f99e1ccc5353984509 Mon Sep 17 00:00:00 2001 From: Arceliar Date: Wed, 29 May 2013 23:10:30 +0200 Subject: [PATCH 3/3] Consistent use of i as an iterator. --- src/proofofwork.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/proofofwork.py b/src/proofofwork.py index 9054e0f5..03d7c22d 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -19,9 +19,9 @@ def run(target, initialHash): for i in range(pool_size): result.append(pool.apply_async(_pool_worker, args = (i, initialHash, target, pool_size))) while True: - for counter in range(pool_size): - if result[counter].ready(): - result = result[counter].get() + for i in range(pool_size): + if result[i].ready(): + result = result[i].get() pool.terminate() return result[0], result[1] time.sleep(1)