Merge branch 'master' into devnet8-engine

Author: acolytec3

.github/workflows/client-build.yml

@@ -95,4 +95,4 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
-          command: cd ${{github.workspace}}/packages/client && npx vitest run test/integration/cli.spec.ts
+          command: cd ${{github.workspace}}/packages/client && npx vitest run test/cli/cli

package-lock.json

@@ -137,11 +137,11 @@ export class RlpxPeer extends Peer {
       this.rlpxPeer = null
       this.connected = false
       this.config.events.emit(Event.PEER_DISCONNECTED, this)
-      this.rlpx?.removeListener('peer:error', peerErrorHandlerBound)
+      this.rlpx?.events.removeListener('peer:error', peerErrorHandlerBound)
     }
-    this.rlpx.on('peer:error', peerErrorHandlerBound)
-    this.rlpx.once('peer:added', peerAddedHandler.bind(this))
-    this.rlpx.once('peer:removed', peerRemovedHandler.bind(this))
+    this.rlpx.events.on('peer:error', peerErrorHandlerBound)
+    this.rlpx.events.once('peer:added', peerAddedHandler.bind(this))
+    this.rlpx.events.once('peer:removed', peerRemovedHandler.bind(this))
   }
 
   /**

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

@@ -19,10 +19,10 @@ export class RlpxSender extends Sender {
     super()
 
     this.sender = rlpxProtocol
-    this.sender.on('status', (status: any) => {
+    this.sender.events.on('status', (status: any) => {
       this.status = status
     })
-    this.sender.on('message', (code: number, payload: any) => {
+    this.sender.events.on('message', (code: number, payload: any) => {
       this.emit('message', { code, payload })
     })
   }

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

@@ -223,9 +223,9 @@ export class RlpxServer extends Server {
         dnsAddr: this.config.dnsAddr,
       })
 
-      this.dpt.on('error', (e: Error) => this.error(e))
+      this.dpt.events.on('error', (e: Error) => this.error(e))
 
-      this.dpt.on('listening', () => {
+      this.dpt.events.on('listening', () => {
         resolve()
       })
 
@@ -250,7 +250,7 @@ export class RlpxServer extends Server {
         common: this.config.chainCommon,
       })
 
-      this.rlpx.on('peer:added', async (rlpxPeer: Devp2pRLPxPeer) => {
+      this.rlpx.events.on('peer:added', async (rlpxPeer: Devp2pRLPxPeer) => {
         let peer: RlpxPeer | null = new RlpxPeer({
           config: this.config,
           id: bytesToUnprefixedHex(rlpxPeer.getId()!),
@@ -276,7 +276,7 @@ export class RlpxServer extends Server {
         }
       })
 
-      this.rlpx.on('peer:removed', (rlpxPeer: Devp2pRLPxPeer, reason: any) => {
+      this.rlpx.events.on('peer:removed', (rlpxPeer: Devp2pRLPxPeer, reason: any) => {
         const id = bytesToUnprefixedHex(rlpxPeer.getId() as Uint8Array)
         const peer = this.peers.get(id)
         if (peer) {
@@ -288,11 +288,13 @@ export class RlpxServer extends Server {
         }
       })
 
-      this.rlpx.on('peer:error', (rlpxPeer: Devp2pRLPxPeer, error: Error) => this.error(error))
+      this.rlpx.events.on('peer:error', (rlpxPeer: Devp2pRLPxPeer, error: Error) =>
+        this.error(error)
+      )
 
-      this.rlpx.on('error', (e: Error) => this.error(e))
+      this.rlpx.events.on('error', (e: Error) => this.error(e))
 
-      this.rlpx.on('listening', () => {
+      this.rlpx.events.on('listening', () => {
         this.config.events.emit(Event.SERVER_LISTENING, {
           transport: this.name,
           url: this.getRlpxInfo().enode ?? '',

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

@@ -1,6 +1,4 @@
 import { json as jsonParser } from 'body-parser'
-import Connect from 'connect'
-import cors from 'cors'
 import { createServer } from 'http'
 import { Server as RPCServer } from 'jayson/promise'
 import { decode } from 'jwt-simple'
@@ -12,6 +10,9 @@ import type { IncomingMessage } from 'connect'
 import type { HttpServer } from 'jayson/promise'
 import type { TAlgorithm } from 'jwt-simple'
 
+const Connect = require('connect')
+const cors = require('cors')
+
 const algorithm: TAlgorithm = 'HS256'
 
 type CreateRPCServerOpts = {
@@ -164,14 +165,14 @@ function checkHeaderAuth(req: any, jwtSecret: Uint8Array): void {
 export function createRPCServerListener(opts: CreateRPCServerListenerOpts): HttpServer {
   const { server, withEngineMiddleware, rpcCors } = opts
 
-  const app = Connect()
+  const app = Connect() as any
   if (typeof rpcCors === 'string') app.use(cors({ origin: rpcCors }))
   // GOSSIP_MAX_SIZE_BELLATRIX is proposed to be 10MiB
   app.use(jsonParser({ limit: '11mb' }))
 
   if (withEngineMiddleware) {
     const { jwtSecret, unlessFn } = withEngineMiddleware
-    app.use((req, res, next) => {
+    app.use((req: any, res: any, next: any) => {
       try {
         if (unlessFn && unlessFn(req)) return next()
         checkHeaderAuth(req, jwtSecret)