prevent disconnect on snap on status timeout as no status handshake o…

…n snap
ethereumjs · May 24, 2022 · a0a19a9 · a0a19a9
1 parent 0bff75f
commit a0a19a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/devp2p/src/protocol/eth.ts b/packages/devp2p/src/protocol/eth.ts
@@ -131,7 +131,7 @@ export class ETH extends Protocol {
 
   _handleStatus(): void {
     if (this._status === null || this._peerStatus === null) return
-    clearTimeout(this._statusTimeoutId)
+    clearTimeout(this._statusTimeoutId!)
 
     assertEq(
       this._status[0],

diff --git a/packages/devp2p/src/protocol/les.ts b/packages/devp2p/src/protocol/les.ts
@@ -90,7 +90,7 @@ export class LES extends Protocol {
 
   _handleStatus() {
     if (this._status === null || this._peerStatus === null) return
-    clearTimeout(this._statusTimeoutId)
+    clearTimeout(this._statusTimeoutId!)
     assertEq(
       this._status['protocolVersion'],
       this._peerStatus['protocolVersion'],

diff --git a/packages/devp2p/src/protocol/protocol.ts b/packages/devp2p/src/protocol/protocol.ts
@@ -18,7 +18,7 @@ export class Protocol extends EventEmitter {
   _version: number
   _peer: Peer
   _send: SendMethod
-  _statusTimeoutId: NodeJS.Timeout
+  _statusTimeoutId?: NodeJS.Timeout
   _messageCodes: MessageCodes
   _debug: Debugger
   _verbose: boolean
@@ -45,9 +45,12 @@ export class Protocol extends EventEmitter {
     this._send = send
     this._version = version
     this._messageCodes = messageCodes
-    this._statusTimeoutId = setTimeout(() => {
-      this._peer.disconnect(DISCONNECT_REASONS.TIMEOUT)
-    }, ms('5s'))
+    this._statusTimeoutId =
+      protocol !== EthProtocol.SNAP
+        ? setTimeout(() => {
+            this._peer.disconnect(DISCONNECT_REASONS.TIMEOUT)
+          }, ms('5s'))
+        : undefined
 
     this._debug = devp2pDebug.extend(protocol)
     this._verbose = createDebugLogger('verbose').enabled