cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ignore eighteenByteRipe value if user specified numberofnullbytesonaddress in keys.dat file

Browse Source
This commit is contained in:
Jonathan Warren 2013-09-19 22:27:01 -04:00
parent 02ea2a50d3
commit a147c38ab6
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/class_addressGenerator.py
View File

@ -25,7 +25,10 @@ class addressGenerator(threading.Thread):
numberOfNullBytesDemandedOnFrontOfRipeHash = shared.config.getint( numberOfNullBytesDemandedOnFrontOfRipeHash = shared.config.getint(
'bitmessagesettings', 'numberofnullbytesonaddress') 'bitmessagesettings', 'numberofnullbytesonaddress')
except: except:
numberOfNullBytesDemandedOnFrontOfRipeHash = 1 # the default if eighteenByteRipe:
numberOfNullBytesDemandedOnFrontOfRipeHash = 2
else:
numberOfNullBytesDemandedOnFrontOfRipeHash = 1 # the default
if queueValue[0] == 'createChan': if queueValue[0] == 'createChan':
command, addressVersionNumber, streamNumber, label, deterministicPassphrase = queueValue command, addressVersionNumber, streamNumber, label, deterministicPassphrase = queueValue
eighteenByteRipe = False eighteenByteRipe = False
@ -58,8 +61,6 @@ class addressGenerator(threading.Thread):
'bitmessagesettings', 'defaultpayloadlengthextrabytes') 'bitmessagesettings', 'defaultpayloadlengthextrabytes')
if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes: if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes:
payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
if eighteenByteRipe:
numberOfNullBytesDemandedOnFrontOfRipeHash = 2
if command == 'createRandomAddress': if command == 'createRandomAddress':
shared.UISignalQueue.put(( shared.UISignalQueue.put((
'updateStatusBar', tr.translateText("MainWindow", "Generating one new address"))) 'updateStatusBar', tr.translateText("MainWindow", "Generating one new address")))

20
src/defaultKnownNodes.py
View File

@ -11,14 +11,18 @@ def createDefaultKnownNodes(appdata):
############## Stream 1 ################ ############## Stream 1 ################
stream1 = {} stream1 = {}
stream1[shared.Peer('85.171.174.131', 8444)] = int(time.time()) stream1[shared.Peer('98.233.84.134', 8444)] = int(time.time())
stream1[shared.Peer('23.28.68.159', 8444)] = int(time.time()) stream1[shared.Peer('76.24.18.44', 8444)] = int(time.time())
stream1[shared.Peer('66.108.210.240', 8444)] = int(time.time()) stream1[shared.Peer('176.31.246.114', 8444)] = int(time.time())
stream1[shared.Peer('204.236.246.212', 8444)] = int(time.time()) stream1[shared.Peer('66.108.210.240', 8080)] = int(time.time())
stream1[shared.Peer('78.81.56.239', 8444)] = int(time.time()) stream1[shared.Peer('76.22.240.163', 8445)] = int(time.time())
stream1[shared.Peer('122.60.235.157', 8444)] = int(time.time()) stream1[shared.Peer('46.21.99.29', 20982)] = int(time.time())
stream1[shared.Peer('204.236.246.212', 8444)] = int(time.time()) stream1[shared.Peer('109.227.72.36', 8444)] = int(time.time())
stream1[shared.Peer('24.98.219.109', 8444)] = int(time.time()) stream1[shared.Peer('176.31.246.114', 8444)] = int(time.time())
stream1[shared.Peer('188.110.3.133', 8444)] = int(time.time())
stream1[shared.Peer('174.0.45.163', 8444)] = int(time.time())
stream1[shared.Peer('134.2.182.92', 8444)] = int(time.time())
stream1[shared.Peer('24.143.60.183', 8444)] = int(time.time())
############# Stream 2 ################# ############# Stream 2 #################