From f645dad56c8361b0c73c12b8663b8938522ddd1c Mon Sep 17 00:00:00 2001 From: Andrew Lott Date: Thu, 8 Jan 2015 00:33:04 +0000 Subject: [PATCH 1/4] Update bitmessage_nl.ts added some unfinished tranlations --- src/translations/bitmessage_nl.ts | 68 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/translations/bitmessage_nl.ts b/src/translations/bitmessage_nl.ts index 654d993a..54237fdd 100644 --- a/src/translations/bitmessage_nl.ts +++ b/src/translations/bitmessage_nl.ts @@ -44,7 +44,7 @@ View HTML code as formatted text - + Bekijk HTML als geformatteerde tekst @@ -84,7 +84,7 @@ Send message to this address - + Stuur bericht naar dit adres @@ -94,7 +94,7 @@ Add New Address - + Nieuw adres toevoegen @@ -104,7 +104,7 @@ Copy destination address to clipboard - + Kopieer bestemmingsadres naar klembord @@ -139,7 +139,7 @@ Message sent. Waiting for acknowledgement. Sent at %1 - + Bericht verzonden. Wachten op bevestiging. Verzonden op %1 @@ -154,7 +154,7 @@ Acknowledgement of the message received %1 - + Bevestiging van het bericht ontvangen op %1 @@ -184,7 +184,7 @@ Unknown status: %1 %2 - + Status onbekend: %1 %2 @@ -204,7 +204,7 @@ Subscribe - + Abonneer @@ -231,7 +231,7 @@ It is important that you back up this file. Open keys.dat? - + keys.dat openen? @@ -288,7 +288,7 @@ It is important that you back up this file. Would you like to open the file now? Success - + Gelukt @@ -298,7 +298,7 @@ It is important that you back up this file. Would you like to open the file now? Address too new - + Adres te nieuw @@ -313,7 +313,7 @@ It is important that you back up this file. Would you like to open the file now? That Bitmessage address is not valid. - + Dat Bitmessage adres is niet geldig. @@ -333,17 +333,17 @@ It is important that you back up this file. Would you like to open the file now? Processed %1 person-to-person messages. - + Verwerkt %1 peer-to-peer-bericht(en). Processed %1 broadcast messages. - + Verwerkt %1 broadcast-bericht(en). Processed %1 public keys. - + Verwerkt %1 publieke sleutel(s). @@ -408,7 +408,7 @@ It is important that you back up this file. Would you like to open the file now? Address version number - + Adres versienummer @@ -458,7 +458,7 @@ It is important that you back up this file. Would you like to open the file now? From - Van + Van @@ -468,7 +468,7 @@ It is important that you back up this file. Would you like to open the file now? The address you entered was invalid. Ignoring it. - + Het ingevoerd adres is ongeldig. Worden genegeerd. @@ -568,7 +568,7 @@ It is important that you back up this file. Would you like to open the file now? No addresses selected. - Geen adressen geselecteerd + Geen adressen geselecteerd. @@ -733,7 +733,7 @@ It is important that you back up this file. Would you like to open the file now? Your Identities - Je identiteiten + Uw identiteiten @@ -803,22 +803,22 @@ It is important that you back up this file. Would you like to open the file now? Processed 0 person-to-person message. - + Verwerkt 0 peer-to-peer-bericht. Processed 0 public key. - + Verwerkt 0 broadcast-bericht. Processed 0 broadcast. - + Verwerkt 0 publieke sleutel. Network Status - + netwerkstatus @@ -848,7 +848,7 @@ It is important that you back up this file. Would you like to open the file now? Ctrl+Q - Ctrrl+Q + Ctrl+Q @@ -883,7 +883,7 @@ It is important that you back up this file. Would you like to open the file now? Bad address version number - + Slechte adres versienummer @@ -1150,7 +1150,7 @@ The 'Random Number' option is selected by default but deterministic ad About - + Over @@ -1173,7 +1173,7 @@ The 'Random Number' option is selected by default but deterministic ad Bitmessage - + Bitmessage @@ -1528,7 +1528,7 @@ The 'Random Number' option is selected by default but deterministic ad Password: - + Wachtwoord @@ -1563,7 +1563,7 @@ The 'Random Number' option is selected by default but deterministic ad Interface Language - + Interface Taal @@ -1633,22 +1633,22 @@ The 'Random Number' option is selected by default but deterministic ad Give up after - + Opgeven na and - + en days - + dagen months. - + maanden. -- 2.45.1 From 5b87bc26ecbde2760dbe7119f09e740c481c192f Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 21 Jan 2015 12:38:25 -0500 Subject: [PATCH 2/4] Fix #758 --- src/class_singleWorker.py | 2 ++ src/proofofwork.py | 1 + src/shared.py | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/class_singleWorker.py b/src/class_singleWorker.py index 5fe85d6d..84f0403c 100644 --- a/src/class_singleWorker.py +++ b/src/class_singleWorker.py @@ -1,3 +1,5 @@ +from __future__ import division + import threading import shared import time diff --git a/src/proofofwork.py b/src/proofofwork.py index 8857ccb3..4392bc7e 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -71,6 +71,7 @@ def _doFastPoW(target, initialHash): time.sleep(0.2) def run(target, initialHash): + target = int(target) if frozen == "macosx_app" or not frozen: return _doFastPoW(target, initialHash) else: diff --git a/src/shared.py b/src/shared.py index 1de8708f..ec16e6e9 100644 --- a/src/shared.py +++ b/src/shared.py @@ -1,3 +1,5 @@ +from __future__ import division + softwareVersion = '0.4.4' verbose = 1 maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 # This is obsolete with the change to protocol v3 but the singleCleaner thread still hasn't been updated so we need this a little longer. -- 2.45.1 From bd9286ef419fc4064deae7ba2ccfbe9625c301eb Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 28 Jan 2015 14:14:28 -0500 Subject: [PATCH 3/4] msg objects now contain an objectVersion --- src/shared.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared.py b/src/shared.py index ec16e6e9..cfe24340 100644 --- a/src/shared.py +++ b/src/shared.py @@ -591,7 +591,7 @@ def checkAndShareObjectWithPeers(data): """ if len(data) > 2 ** 18: logger.info('The payload length of this object is too large (%s bytes). Ignoring it.' % len(data)) - return + return 0 # Let us check to make sure that the proof of work is sufficient. if not isProofOfWorkSufficient(data): logger.info('Proof of work is insufficient.') @@ -663,6 +663,9 @@ def _checkAndShareUndefinedObjectWithPeers(data): def _checkAndShareMsgWithPeers(data): embeddedTime, = unpack('>Q', data[8:16]) readPosition = 20 # bypass nonce, time, and object type + objectVersion, objectVersionLength = decodeVarint( + data[readPosition:readPosition + 9]) + readPosition += objectVersionLength streamNumber, streamNumberLength = decodeVarint( data[readPosition:readPosition + 9]) if not streamNumber in streamsInWhichIAmParticipating: -- 2.45.1 From 0c7330f900337c590a0b4437a79127f2025ce39b Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 28 Jan 2015 14:45:29 -0500 Subject: [PATCH 4/4] fix misbehaving logger.warning line --- src/class_receiveDataThread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/class_receiveDataThread.py b/src/class_receiveDataThread.py index f53aec1e..53281aca 100644 --- a/src/class_receiveDataThread.py +++ b/src/class_receiveDataThread.py @@ -479,7 +479,7 @@ class receiveDataThread(threading.Thread): payload, = row self.sendObject(payload) else: - logger.warning('%s asked for an object with a getdata which is not in either our memory inventory or our SQL inventory. We probably cleaned it out after advertising it but before they got around to asking for it.' % self.peer) + logger.warning('%s asked for an object with a getdata which is not in either our memory inventory or our SQL inventory. We probably cleaned it out after advertising it but before they got around to asking for it.' % (self.peer,)) # Our peer has requested (in a getdata message) that we send an object. def sendObject(self, payload): -- 2.45.1