From 1c8ae8fef34dd791218e44bf35f4a52f2185994d Mon Sep 17 00:00:00 2001 From: anand k Date: Sun, 21 Apr 2024 20:54:04 +0530 Subject: [PATCH 1/2] moved Dandelion in state - global runtime variable from singleton --- src/network/__init__.py | 3 ++- src/network/bmobject.py | 3 +-- src/network/bmproto.py | 11 +++++------ src/network/dandelion.py | 2 -- src/network/downloadthread.py | 3 +-- src/network/invthread.py | 13 ++++++------- src/network/objectracker.py | 8 ++++---- src/network/tcp.py | 7 +++---- src/network/uploadthread.py | 5 ++--- src/state.py | 3 +++ 10 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/network/__init__.py b/src/network/__init__.py index 1b5aef92..49f77c43 100644 --- a/src/network/__init__.py +++ b/src/network/__init__.py @@ -16,6 +16,7 @@ __all__ = ["AnnounceThread", "BMConnectionPool", "StoppableThread"] def start(config, state): """Start network threads""" + import state from .addrthread import AddrThread from .dandelion import Dandelion from .downloadthread import DownloadThread @@ -27,7 +28,7 @@ def start(config, state): readKnownNodes() # init, needs to be early because other thread may access it early - Dandelion() + state.Dandelion = Dandelion() BMConnectionPool().connectToStream(1) for thread in ( BMNetworkThread(), InvThread(), AddrThread(), diff --git a/src/network/bmobject.py b/src/network/bmobject.py index 76467087..685e3c59 100644 --- a/src/network/bmobject.py +++ b/src/network/bmobject.py @@ -7,7 +7,6 @@ import time import protocol import state from highlevelcrypto import calculateInventoryHash -from network.dandelion import Dandelion logger = logging.getLogger('default') @@ -112,7 +111,7 @@ class BMObject(object): # pylint: disable=too-many-instance-attributes or advertise it unnecessarily) """ # if it's a stem duplicate, pretend we don't have it - if Dandelion().hasHash(self.inventoryHash): + if state.Dandelion.hasHash(self.inventoryHash): return if self.inventoryHash in state.Inventory: raise BMObjectAlreadyHaveError() diff --git a/src/network/bmproto.py b/src/network/bmproto.py index 2a05b942..f4dd8845 100644 --- a/src/network/bmproto.py +++ b/src/network/bmproto.py @@ -25,7 +25,6 @@ from network.bmobject import ( BMObjectInsufficientPOWError, BMObjectInvalidError, BMObjectUnwantedStreamError ) -from network.dandelion import Dandelion from network.proxy import ProxyError from node import Node, Peer @@ -355,10 +354,10 @@ class BMProto(AdvancedDispatcher, ObjectTracker): return True for i in map(str, items): - if i in state.Inventory and not Dandelion().hasHash(i): + if i in state.Inventory and not state.Dandelion.hasHash(i): continue - if dandelion and not Dandelion().hasHash(i): - Dandelion().addHash(i, self) + if dandelion and not state.Dandelion.hasHash(i): + state.Dandelion.addHash(i, self) self.handleReceivedInventory(i) return True @@ -420,9 +419,9 @@ class BMProto(AdvancedDispatcher, ObjectTracker): except KeyError: pass - if self.object.inventoryHash in state.Inventory and Dandelion().hasHash( + if self.object.inventoryHash in state.Inventory and state.Dandelion.hasHash( self.object.inventoryHash): - Dandelion().removeHash( + state.Dandelion.removeHash( self.object.inventoryHash, "cycle detection") state.Inventory[self.object.inventoryHash] = ( diff --git a/src/network/dandelion.py b/src/network/dandelion.py index 4f3cd07b..8a7aff29 100644 --- a/src/network/dandelion.py +++ b/src/network/dandelion.py @@ -10,7 +10,6 @@ from time import time import connectionpool import state from queues import invQueue -from singleton import Singleton # randomise routes after 600 seconds REASSIGN_INTERVAL = 600 @@ -26,7 +25,6 @@ Stem = namedtuple('Stem', ['child', 'stream', 'timeout']) logger = logging.getLogger('default') -@Singleton class Dandelion: # pylint: disable=old-style-class """Dandelion class for tracking stem/fluff stages.""" def __init__(self): diff --git a/src/network/downloadthread.py b/src/network/downloadthread.py index b668d813..777f190d 100644 --- a/src/network/downloadthread.py +++ b/src/network/downloadthread.py @@ -6,7 +6,6 @@ import state import addresses import helper_random import protocol -from dandelion import Dandelion from network.connectionpool import BMConnectionPool from objectracker import missingObjects from threads import StoppableThread @@ -60,7 +59,7 @@ class DownloadThread(StoppableThread): payload = bytearray() chunkCount = 0 for chunk in request: - if chunk in state.Inventory and not Dandelion().hasHash(chunk): + if chunk in state.Inventory and not state.Dandelion.hasHash(chunk): try: del i.objectsNewToMe[chunk] except KeyError: diff --git a/src/network/invthread.py b/src/network/invthread.py index 14217041..e1dc1b65 100644 --- a/src/network/invthread.py +++ b/src/network/invthread.py @@ -9,7 +9,6 @@ import addresses import protocol import state from network.connectionpool import BMConnectionPool -from network.dandelion import Dandelion from queues import invQueue from threads import StoppableThread @@ -40,10 +39,10 @@ class InvThread(StoppableThread): @staticmethod def handleLocallyGenerated(stream, hashId): """Locally generated inventory items require special handling""" - Dandelion().addHash(hashId, stream=stream) + state.Dandelion.addHash(hashId, stream=stream) for connection in BMConnectionPool().connections(): if state.dandelion and connection != \ - Dandelion().objectChildStem(hashId): + state.Dandelion.objectChildStem(hashId): continue connection.objectsNewToThem[hashId] = time() @@ -52,7 +51,7 @@ class InvThread(StoppableThread): chunk = [] while True: # Dandelion fluff trigger by expiration - handleExpiredDandelion(Dandelion().expire()) + handleExpiredDandelion(state.Dandelion.expire()) try: data = invQueue.get(False) chunk.append((data[0], data[1])) @@ -75,7 +74,7 @@ class InvThread(StoppableThread): except KeyError: continue try: - if connection == Dandelion().objectChildStem(inv[1]): + if connection == state.Dandelion.objectChildStem(inv[1]): # Fluff trigger by RNG # auto-ignore if config set to 0, i.e. dandelion is off if random.randint(1, 100) >= state.dandelion: # nosec B311 @@ -105,7 +104,7 @@ class InvThread(StoppableThread): for _ in range(len(chunk)): invQueue.task_done() - if Dandelion().refresh < time(): - Dandelion().reRandomiseStems() + if state.Dandelion.refresh < time(): + state.Dandelion.reRandomiseStems() self.stop.wait(1) diff --git a/src/network/objectracker.py b/src/network/objectracker.py index 65e06de4..8de098ce 100644 --- a/src/network/objectracker.py +++ b/src/network/objectracker.py @@ -4,8 +4,8 @@ Module for tracking objects import time from threading import RLock +import state import network.connectionpool -from network.dandelion import Dandelion from randomtrackingdict import RandomTrackingDict haveBloom = False @@ -107,14 +107,14 @@ class ObjectTracker(object): del i.objectsNewToMe[hashid] except KeyError: if streamNumber in i.streams and ( - not Dandelion().hasHash(hashid) - or Dandelion().objectChildStem(hashid) == i): + not state.Dandelion.hasHash(hashid) + or state.Dandelion.objectChildStem(hashid) == i): with i.objectsNewToThemLock: i.objectsNewToThem[hashid] = time.time() # update stream number, # which we didn't have when we just received the dinv # also resets expiration of the stem mode - Dandelion().setHashStream(hashid, streamNumber) + state.Dandelion.setHashStream(hashid, streamNumber) if i == self: try: diff --git a/src/network/tcp.py b/src/network/tcp.py index 0acbf89a..0964d8b8 100644 --- a/src/network/tcp.py +++ b/src/network/tcp.py @@ -25,7 +25,6 @@ import connectionpool import knownnodes from network.advanceddispatcher import AdvancedDispatcher from network.bmproto import BMProto -from network.dandelion import Dandelion from network.objectracker import ObjectTracker from network.socks4a import Socks4aConnection from network.socks5 import Socks5Connection @@ -169,7 +168,7 @@ class TCPConnection(BMProto, TLSDispatcher): knownnodes.increaseRating(self.destination) knownnodes.addKnownNode( self.streams, self.destination, time.time()) - Dandelion().maybeAddStem(self) + state.Dandelion.maybeAddStem(self) self.sendAddr() self.sendBigInv() @@ -231,7 +230,7 @@ class TCPConnection(BMProto, TLSDispatcher): with self.objectsNewToThemLock: for objHash in state.Inventory.unexpired_hashes_by_stream(stream): # don't advertise stem objects on bigInv - if Dandelion().hasHash(objHash): + if state.Dandelion.hasHash(objHash): continue bigInvList[objHash] = 0 objectCount = 0 @@ -293,7 +292,7 @@ class TCPConnection(BMProto, TLSDispatcher): if host_is_global: knownnodes.addKnownNode( self.streams, self.destination, time.time()) - Dandelion().maybeRemoveStem(self) + state.Dandelion.maybeRemoveStem(self) else: self.checkTimeOffsetNotification() if host_is_global: diff --git a/src/network/uploadthread.py b/src/network/uploadthread.py index a72b80ef..8b3e5938 100644 --- a/src/network/uploadthread.py +++ b/src/network/uploadthread.py @@ -7,7 +7,6 @@ import helper_random import protocol import state from network.connectionpool import BMConnectionPool -from network.dandelion import Dandelion from randomtrackingdict import RandomTrackingDict from threads import StoppableThread @@ -41,8 +40,8 @@ class UploadThread(StoppableThread): chunk_count = 0 for chunk in request: del i.pendingUpload[chunk] - if Dandelion().hasHash(chunk) and \ - i != Dandelion().objectChildStem(chunk): + if state.Dandelion.hasHash(chunk) and \ + i != state.Dandelion.objectChildStem(chunk): i.antiIntersectionDelay() self.logger.info( '%s asked for a stem object we didn\'t offer to it.', diff --git a/src/state.py b/src/state.py index a72e230d..21584560 100644 --- a/src/state.py +++ b/src/state.py @@ -97,3 +97,6 @@ class Placeholder(object): # pylint:disable=too-few-public-methods Inventory = Placeholder("Inventory") + + +Dandelion = Placeholder("Dandelion") -- 2.45.1 From 95af3a859bdfb647f0f1a70291705c6af1131e10 Mon Sep 17 00:00:00 2001 From: anand k Date: Mon, 22 Apr 2024 08:59:00 +0530 Subject: [PATCH 2/2] Renamed dandelion flag to dandelion_enabled --- src/bitmessagemain.py | 6 +++--- src/network/bmproto.py | 2 +- src/network/dandelion.py | 2 +- src/network/invthread.py | 4 ++-- src/protocol.py | 4 ++-- src/state.py | 2 +- src/tests/core.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 18e62773..f51ee063 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -156,12 +156,12 @@ class Main(object): set_thread_name("PyBitmessage") - state.dandelion = config.safeGetInt('network', 'dandelion') + state.dandelion_enabled = config.safeGetInt('network', 'dandelion') # dandelion requires outbound connections, without them, # stem objects will get stuck forever - if state.dandelion and not config.safeGetBoolean( + if state.dandelion_enabled and not config.safeGetBoolean( 'bitmessagesettings', 'sendoutgoingconnections'): - state.dandelion = 0 + state.dandelion_enabled = 0 if state.testmode or config.safeGetBoolean( 'bitmessagesettings', 'extralowdifficulty'): diff --git a/src/network/bmproto.py b/src/network/bmproto.py index f4dd8845..a0674077 100644 --- a/src/network/bmproto.py +++ b/src/network/bmproto.py @@ -350,7 +350,7 @@ class BMProto(AdvancedDispatcher, ObjectTracker): raise BMProtoExcessiveDataError() # ignore dinv if dandelion turned off - if dandelion and not state.dandelion: + if dandelion and not state.dandelion_enabled: return True for i in map(str, items): diff --git a/src/network/dandelion.py b/src/network/dandelion.py index 8a7aff29..35e70c95 100644 --- a/src/network/dandelion.py +++ b/src/network/dandelion.py @@ -49,7 +49,7 @@ class Dandelion: # pylint: disable=old-style-class def addHash(self, hashId, source=None, stream=1): """Add inventory vector to dandelion stem""" - if not state.dandelion: + if not state.dandelion_enabled: return with self.lock: self.hashMap[hashId] = Stem( diff --git a/src/network/invthread.py b/src/network/invthread.py index e1dc1b65..346baa93 100644 --- a/src/network/invthread.py +++ b/src/network/invthread.py @@ -41,7 +41,7 @@ class InvThread(StoppableThread): """Locally generated inventory items require special handling""" state.Dandelion.addHash(hashId, stream=stream) for connection in BMConnectionPool().connections(): - if state.dandelion and connection != \ + if state.dandelion_enabled and connection != \ state.Dandelion.objectChildStem(hashId): continue connection.objectsNewToThem[hashId] = time() @@ -77,7 +77,7 @@ class InvThread(StoppableThread): if connection == state.Dandelion.objectChildStem(inv[1]): # Fluff trigger by RNG # auto-ignore if config set to 0, i.e. dandelion is off - if random.randint(1, 100) >= state.dandelion: # nosec B311 + if random.randint(1, 100) >= state.dandelion_enabled: # nosec B311 fluffs.append(inv[1]) # send a dinv only if the stem node supports dandelion elif connection.services & protocol.NODE_DANDELION > 0: diff --git a/src/protocol.py b/src/protocol.py index d6ea884d..d1a5f865 100644 --- a/src/protocol.py +++ b/src/protocol.py @@ -351,7 +351,7 @@ def assembleVersionMessage( '>q', NODE_NETWORK | (NODE_SSL if haveSSL(server) else 0) - | (NODE_DANDELION if state.dandelion else 0) + | (NODE_DANDELION if state.dandelion_enabled else 0) ) payload += pack('>q', int(time.time())) @@ -375,7 +375,7 @@ def assembleVersionMessage( '>q', NODE_NETWORK | (NODE_SSL if haveSSL(server) else 0) - | (NODE_DANDELION if state.dandelion else 0) + | (NODE_DANDELION if state.dandelion_enabled else 0) ) # = 127.0.0.1. This will be ignored by the remote host. # The actual remote connected IP will be used. diff --git a/src/state.py b/src/state.py index 21584560..e3f49215 100644 --- a/src/state.py +++ b/src/state.py @@ -44,7 +44,7 @@ ownAddresses = {} discoveredPeers = {} -dandelion = 0 +dandelion_enabled = 0 kivy = False diff --git a/src/tests/core.py b/src/tests/core.py index 868efe2b..21966dcc 100644 --- a/src/tests/core.py +++ b/src/tests/core.py @@ -324,7 +324,7 @@ class TestCore(unittest.TestCase): decoded = self._decode_msg(msg, "IQQiiQlsLv") peer, _, ua, streams = self._decode_msg(msg, "IQQiiQlsLv")[4:] self.assertEqual( - peer, Node(11 if state.dandelion else 3, '127.0.0.1', 8444)) + peer, Node(11 if state.dandelion_enabled else 3, '127.0.0.1', 8444)) self.assertEqual(ua, '/PyBitmessage:' + softwareVersion + '/') self.assertEqual(streams, [1]) # with multiple streams -- 2.45.1