Merge pull request #1087 from ethereumjs/client-devp2p-connection-improvements

Client & dDevp2p connection improvements

Author: holgerd77

packages/client/lib/config.ts

@@ -126,7 +126,7 @@ export class Config {
   public static readonly RPCPORT_DEFAULT = 8545
   public static readonly RPCADDR_DEFAULT = 'localhost'
   public static readonly LOGLEVEL_DEFAULT = 'info'
-  public static readonly MINPEERS_DEFAULT = 2
+  public static readonly MINPEERS_DEFAULT = 1
   public static readonly MAXPEERS_DEFAULT = 25
   public static readonly DNSADDR_DEFAULT = '8.8.8.8'
 

packages/client/lib/net/protocol/rlpxsender.ts

@@ -1,5 +1,4 @@
 import { Sender } from './sender'
-import { rlp } from 'ethereumjs-util'
 import { ETH as Devp2pETH, LES as Devp2pLES } from '@ethereumjs/devp2p'
 
 /**
@@ -45,7 +44,8 @@ export class RlpxSender extends Sender {
    */
   sendMessage(code: number, data: any) {
     try {
-      this.sender._send(code, rlp.encode(data))
+      //@ts-ignore "type number is not assignable to type never"
+      this.sender.sendMessage(code, data)
     } catch (err) {
       this.emit('error', err)
     }

packages/client/lib/net/server/rlpxserver.ts

@@ -122,8 +122,12 @@ export class RlpxServer extends Server {
     await super.start()
     this.initDpt()
     this.initRlpx()
-    await this.bootstrap()
     this.started = true
+    // Boostrapping is technically not needed for a server start
+    // (this is a repeated process) and setting `started` to `true`
+    // before allows other services to resolve earlier and makes
+    // the sync pick-up more reliable
+    await this.bootstrap()
 
     return true
   }

packages/client/test/net/protocol/rlpxsender.spec.ts

@@ -1,7 +1,6 @@
 import { EventEmitter } from 'events'
 import tape from 'tape-catch'
 import td from 'testdouble'
-import * as rlp from 'rlp'
 import { ETH as Devp2pETH } from '@ethereumjs/devp2p'
 import { RlpxSender } from '../../../lib/net/protocol'
 
@@ -21,7 +20,7 @@ tape('[RlpxSender]', (t) => {
     const rlpxProtocol = td.object() as any
     const sender = new RlpxSender(rlpxProtocol)
     sender.sendMessage(1, 5)
-    td.verify(rlpxProtocol._send(1, rlp.encode(5)))
+    td.verify(rlpxProtocol.sendMessage(1, 5))
     td.reset()
     t.pass('message sent')
     t.end()

packages/devp2p/src/les/index.ts

@@ -158,7 +158,12 @@ export class LES extends EventEmitter {
     this._handleStatus()
   }
 
-  sendMessage(code: LES.MESSAGE_CODES, reqId: number, payload: any) {
+  /**
+   *
+   * @param code Message code
+   * @param payload Payload (including reqId, e.g. `[1, [437000, 1, 0, 0]]`)
+   */
+  sendMessage(code: LES.MESSAGE_CODES, payload: any) {
     const debugMsg = `Send ${this.getMsgPrefix(code)} message to ${
       this._peer._socket.remoteAddress
     }:${this._peer._socket.remotePort}`
@@ -197,7 +202,7 @@ export class LES extends EventEmitter {
         throw new Error(`Unknown code ${code}`)
     }
 
-    this._send(code, rlp.encode([reqId, payload]))
+    this._send(code, rlp.encode(payload))
   }
 
   getMsgPrefix(msgCode: LES.MESSAGE_CODES) {

packages/devp2p/src/rlpx/rlpx.ts

@@ -266,11 +266,15 @@ export class RLPx extends EventEmitter {
 
   _refillConnections() {
     if (!this._isAlive()) return
-    debug(
-      `refill connections.. (selector ${this._refillIntervalSelectionCounter}) peers: ${
-        this._peers.size
-      }, queue size: ${this._peersQueue.length}, open slots: ${this._getOpenSlots()}`
-    )
+    if (this._refillIntervalSelectionCounter === 0) {
+      debug(
+        `Restart connection refill .. with selector ${
+          this._refillIntervalSelectionCounter
+        } peers: ${this._peers.size}, queue size: ${
+          this._peersQueue.length
+        }, open slots: ${this._getOpenSlots()}`
+      )
+    }
     // Rotating selection counter going in loop from 0..9
     this._refillIntervalSelectionCounter = (this._refillIntervalSelectionCounter + 1) % 10
 

packages/devp2p/test/integration/les-simulator.ts

@@ -85,7 +85,7 @@ test('LES: send valid message', async (t) => {
   opts.status1 = Object.assign({}, status)
   opts.onOnceStatus0 = function (rlpxs: any, les: any) {
     t.equal(les.getVersion(), 2, 'should use les2 as protocol version')
-    les.sendMessage(devp2p.LES.MESSAGE_CODES.GET_BLOCK_HEADERS, 1, [437000, 1, 0, 0])
+    les.sendMessage(devp2p.LES.MESSAGE_CODES.GET_BLOCK_HEADERS, [1, [437000, 1, 0, 0]])
     t.pass('should send GET_BLOCK_HEADERS message')
   }
   opts.onOnMsg1 = function (rlpxs: any, eth: any, code: any) {
@@ -104,7 +104,7 @@ test('LES: send unknown message code', async (t) => {
   opts.status1 = Object.assign({}, status)
   opts.onOnceStatus0 = function (rlpxs: any, les: any) {
     try {
-      les.sendMessage(0x55, 1, [])
+      les.sendMessage(0x55, [1, []])
     } catch (err) {
       const msg = 'Error: Unknown code 85'
       t.equal(err.toString(), msg, `should emit error: ${msg}`)