client: integrated ETH/64 protocol

Author: holgerd77

packages/client/lib/net/peer/rlpxpeer.ts

@@ -10,8 +10,8 @@ import { Protocol, RlpxSender } from '../protocol'
 import { Peer, PeerOptions } from './peer'
 
 const devp2pCapabilities: any = {
-  eth62: Devp2pETH.eth62,
   eth63: Devp2pETH.eth63,
+  eth64: Devp2pETH.eth64,
   les2: Devp2pLES.les2,
 }
 
@@ -157,9 +157,9 @@ export class RlpxPeer extends Peer {
   async bindProtocols(rlpxPeer: Devp2pRlpxPeer): Promise<void> {
     this.rlpxPeer = rlpxPeer
     await Promise.all(
-      rlpxPeer.getProtocols().map((rlpxProtocol: any) => {
+      rlpxPeer.getProtocols().map((rlpxProtocol) => {
         const name = rlpxProtocol.constructor.name.toLowerCase()
-        const protocol = this.protocols.find((p: any) => p.name === name)
+        const protocol = this.protocols.find((p) => p.name === name)
         if (protocol) {
           return this.bindProtocol(protocol, new RlpxSender(rlpxProtocol))
         }

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

@@ -99,7 +99,7 @@ export class EthProtocol extends Protocol {
    * @type {number[]}
    */
   get versions(): number[] {
-    return [63, 62]
+    return [64, 63]
   }
 
   /**
@@ -127,6 +127,7 @@ export class EthProtocol extends Protocol {
    * @return {Object}
    */
   encodeStatus(): any {
+    // TODO: add latestBlock for more precise ETH/64 forkhash switch
     return {
       networkId: this.chain.networkId,
       td: this.chain.blocks.td.toArrayLike(Buffer),

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

@@ -1,5 +1,6 @@
 import { Sender } from './sender'
 import { rlp } from 'ethereumjs-util'
+import { ETH as Devp2pETH, LES as Devp2pLES } from '@ethereumjs/devp2p'
 
 /**
  * DevP2P/RLPx protocol sender
@@ -8,12 +9,12 @@ import { rlp } from 'ethereumjs-util'
  * @memberof module:net/protocol
  */
 export class RlpxSender extends Sender {
-  private sender: any
+  private sender: Devp2pETH | Devp2pLES
   /**
    * Creates a new DevP2P/Rlpx protocol sender
-   * @param {Object} rlpxProtocol protocol object from ethereumjs-devp2p
+   * @param {Object} rlpxProtocol protocol object from @ethereumjs/devp2p
    */
-  constructor(rlpxProtocol: any) {
+  constructor(rlpxProtocol: Devp2pETH | Devp2pLES) {
     super()
 
     this.sender = rlpxProtocol

packages/client/test/net/peer/rlpxpeer.spec.ts

@@ -28,7 +28,7 @@ tape('[RlpxPeer]', async (t) => {
 
   t.test('should compute capabilities', (t) => {
     const protocols: any = [
-      { name: 'eth', versions: [62, 63] },
+      { name: 'eth', versions: [63, 64] },
       { name: 'les', versions: [2] },
     ]
     const caps = RlpxPeer.capabilities(protocols).map(({ name, version, length }) => ({
@@ -39,8 +39,8 @@ tape('[RlpxPeer]', async (t) => {
     t.deepEquals(
       caps,
       [
-        { name: 'eth', version: 62, length: 8 },
         { name: 'eth', version: 63, length: 17 },
+        { name: 'eth', version: 64, length: 29 },
         { name: 'les', version: 2, length: 21 },
       ],
       'correct capabilities'

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

@@ -2,6 +2,7 @@ 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'
 
 tape('[RlpxSender]', (t) => {
@@ -28,7 +29,7 @@ tape('[RlpxSender]', (t) => {
 
   t.test('should receive status', (t) => {
     const rlpxProtocol = new EventEmitter()
-    const sender = new RlpxSender(rlpxProtocol)
+    const sender = new RlpxSender(rlpxProtocol as Devp2pETH)
     sender.on('status', (status: any) => {
       t.equal(status.id, 5, 'status received')
       t.equal(sender.status.id, 5, 'status getter')
@@ -39,7 +40,7 @@ tape('[RlpxSender]', (t) => {
 
   t.test('should receive message', (t) => {
     const rlpxProtocol = new EventEmitter()
-    const sender = new RlpxSender(rlpxProtocol)
+    const sender = new RlpxSender(rlpxProtocol as Devp2pETH)
     sender.on('message', (message: any) => {
       t.equal(message.code, 1, 'message received (code)')
       t.equal(message.payload, 5, 'message received (payload)')
@@ -50,7 +51,7 @@ tape('[RlpxSender]', (t) => {
 
   t.test('should catch errors', (t) => {
     const rlpxProtocol = new EventEmitter()
-    const sender = new RlpxSender(rlpxProtocol)
+    const sender = new RlpxSender(rlpxProtocol as Devp2pETH)
     t.throws(() => sender.sendStatus({ id: 5 }), /not a function/, 'sendStatus error')
     t.throws(() => sender.sendMessage(1, 5), /not a function/, 'sendMessage error')
     t.end()

packages/devp2p/src/eth/index.ts

@@ -265,7 +265,6 @@ export namespace ETH {
   export interface StatusMsg extends Array<Buffer | Buffer[]> {}
 
   export type StatusOpts = {
-    version: number
     td: Buffer
     bestHash: Buffer
     latestBlock?: number