diff --git a/src/class_addressGenerator.py b/src/class_addressGenerator.py index 749e542d..3d0611d5 100644 --- a/src/class_addressGenerator.py +++ b/src/class_addressGenerator.py @@ -25,7 +25,10 @@ class addressGenerator(threading.Thread): numberOfNullBytesDemandedOnFrontOfRipeHash = shared.config.getint( 'bitmessagesettings', 'numberofnullbytesonaddress') except: - numberOfNullBytesDemandedOnFrontOfRipeHash = 1 # the default + if eighteenByteRipe: + numberOfNullBytesDemandedOnFrontOfRipeHash = 2 + else: + numberOfNullBytesDemandedOnFrontOfRipeHash = 1 # the default if queueValue[0] == 'createChan': command, addressVersionNumber, streamNumber, label, deterministicPassphrase = queueValue eighteenByteRipe = False @@ -58,8 +61,6 @@ class addressGenerator(threading.Thread): 'bitmessagesettings', 'defaultpayloadlengthextrabytes') if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes: payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes - if eighteenByteRipe: - numberOfNullBytesDemandedOnFrontOfRipeHash = 2 if command == 'createRandomAddress': shared.UISignalQueue.put(( 'updateStatusBar', tr.translateText("MainWindow", "Generating one new address"))) diff --git a/src/defaultKnownNodes.py b/src/defaultKnownNodes.py index f481581c..92e53339 100644 --- a/src/defaultKnownNodes.py +++ b/src/defaultKnownNodes.py @@ -11,14 +11,18 @@ def createDefaultKnownNodes(appdata): ############## Stream 1 ################ stream1 = {} - stream1[shared.Peer('85.171.174.131', 8444)] = int(time.time()) - stream1[shared.Peer('23.28.68.159', 8444)] = int(time.time()) - stream1[shared.Peer('66.108.210.240', 8444)] = int(time.time()) - stream1[shared.Peer('204.236.246.212', 8444)] = int(time.time()) - stream1[shared.Peer('78.81.56.239', 8444)] = int(time.time()) - stream1[shared.Peer('122.60.235.157', 8444)] = int(time.time()) - stream1[shared.Peer('204.236.246.212', 8444)] = int(time.time()) - stream1[shared.Peer('24.98.219.109', 8444)] = int(time.time()) + stream1[shared.Peer('98.233.84.134', 8444)] = int(time.time()) + stream1[shared.Peer('76.24.18.44', 8444)] = int(time.time()) + stream1[shared.Peer('176.31.246.114', 8444)] = int(time.time()) + stream1[shared.Peer('66.108.210.240', 8080)] = int(time.time()) + stream1[shared.Peer('76.22.240.163', 8445)] = int(time.time()) + stream1[shared.Peer('46.21.99.29', 20982)] = int(time.time()) + stream1[shared.Peer('109.227.72.36', 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 #################