Bitmessage/PyBitmessage-2024-11-28
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Merge branch '1170' into upstream-v0.6

Browse Source
This commit is contained in:
Peter Šurda 2018-03-21 13:08:10 +01:00
commit f3960c1638
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/class_singleWorker.py
View File

@ -25,6 +25,7 @@ import protocol
import queues import queues
import state import state
from binascii import hexlify, unhexlify from binascii import hexlify, unhexlify
import helper_random
# This thread, of which there is only one, does the heavy lifting: # This thread, of which there is only one, does the heavy lifting:
# calculating POWs. # calculating POWs.
@ -158,7 +159,7 @@ class singleWorker(threading.Thread, StoppableThread):
status, addressVersionNumber, streamNumber, hash = decodeAddress( status, addressVersionNumber, streamNumber, hash = decodeAddress(
myAddress) myAddress)
TTL = int(28 * 24 * 60 * 60 + random.randrange(-300, 300))# 28 days from now plus or minus five minutes TTL = int(28 * 24 * 60 * 60 + helper_random.randomrandrange(-300, 300))# 28 days from now plus or minus five minutes
embeddedTime = int(time.time() + TTL) embeddedTime = int(time.time() + TTL)
payload = pack('>Q', (embeddedTime)) payload = pack('>Q', (embeddedTime))
payload += '\x00\x00\x00\x01' # object type: pubkey payload += '\x00\x00\x00\x01' # object type: pubkey
@ -229,7 +230,8 @@ class singleWorker(threading.Thread, StoppableThread):
status, addressVersionNumber, streamNumber, hash = decodeAddress( status, addressVersionNumber, streamNumber, hash = decodeAddress(
myAddress) myAddress)
TTL = int(28 * 24 * 60 * 60 + random.randrange(-300, 300))# 28 days from now plus or minus five minutes TTL = int(28 * 24 * 60 * 60 + helper_random.randomrandrange(-300, 300))
# 28 days from now plus or minus five minutes
embeddedTime = int(time.time() + TTL) embeddedTime = int(time.time() + TTL)
signedTimeForProtocolV2 = embeddedTime - TTL signedTimeForProtocolV2 = embeddedTime - TTL
""" """
@ -314,7 +316,8 @@ class singleWorker(threading.Thread, StoppableThread):
status, addressVersionNumber, streamNumber, hash = decodeAddress( status, addressVersionNumber, streamNumber, hash = decodeAddress(
myAddress) myAddress)
TTL = int(28 * 24 * 60 * 60 + random.randrange(-300, 300))# 28 days from now plus or minus five minutes TTL = int(28 * 24 * 60 * 60 + helper_random.randomrandrange(-300, 300))
# 28 days from now plus or minus five minutes
embeddedTime = int(time.time() + TTL) embeddedTime = int(time.time() + TTL)
payload = pack('>Q', (embeddedTime)) payload = pack('>Q', (embeddedTime))
payload += '\x00\x00\x00\x01' # object type: pubkey payload += '\x00\x00\x00\x01' # object type: pubkey
@ -433,7 +436,8 @@ class singleWorker(threading.Thread, StoppableThread):
TTL = 28 * 24 * 60 * 60 TTL = 28 * 24 * 60 * 60
if TTL < 60*60: if TTL < 60*60:
TTL = 60*60 TTL = 60*60
TTL = int(TTL + random.randrange(-300, 300))# add some randomness to the TTL TTL = int(TTL + helper_random.randomrandrange(-300, 300))
# add some randomness to the TTL
embeddedTime = int(time.time() + TTL) embeddedTime = int(time.time() + TTL)
payload = pack('>Q', embeddedTime) payload = pack('>Q', embeddedTime)
payload += '\x00\x00\x00\x03' # object type: broadcast payload += '\x00\x00\x00\x03' # object type: broadcast
@ -625,7 +629,8 @@ class singleWorker(threading.Thread, StoppableThread):
TTL *= 2**retryNumber TTL *= 2**retryNumber
if TTL > 28 * 24 * 60 * 60: if TTL > 28 * 24 * 60 * 60:
TTL = 28 * 24 * 60 * 60 TTL = 28 * 24 * 60 * 60
TTL = int(TTL + random.randrange(-300, 300))# add some randomness to the TTL TTL = int(TTL + helper_random.randomrandrange(-300, 300))
# add some randomness to the TTL
embeddedTime = int(time.time() + TTL) embeddedTime = int(time.time() + TTL)
if not BMConfigParser().has_section(toaddress): # if we aren't sending this to ourselves or a chan if not BMConfigParser().has_section(toaddress): # if we aren't sending this to ourselves or a chan
@ -907,7 +912,7 @@ class singleWorker(threading.Thread, StoppableThread):
TTL *= 2**retryNumber TTL *= 2**retryNumber
if TTL > 28*24*60*60: if TTL > 28*24*60*60:
TTL = 28*24*60*60 TTL = 28*24*60*60
TTL = TTL + random.randrange(-300, 300) # add some randomness to the TTL TTL = TTL + helper_random.randomrandrange(-300, 300)# add some randomness to the TTL
embeddedTime = int(time.time() + TTL) embeddedTime = int(time.time() + TTL)
payload = pack('>Q', embeddedTime) payload = pack('>Q', embeddedTime)
payload += '\x00\x00\x00\x00' # object type: getpubkey payload += '\x00\x00\x00\x00' # object type: getpubkey
@ -969,7 +974,8 @@ class singleWorker(threading.Thread, StoppableThread):
TTL = 7*24*60*60 # 1 week TTL = 7*24*60*60 # 1 week
else: else:
TTL = 28*24*60*60 # 4 weeks TTL = 28*24*60*60 # 4 weeks
TTL = int(TTL + random.randrange(-300, 300)) # Add some randomness to the TTL TTL = int(TTL + helper_random.randomrandrange(-300, 300))
# Add some randomness to the TTL
embeddedTime = int(time.time() + TTL) embeddedTime = int(time.time() + TTL)
# type/version/stream already included # type/version/stream already included