client: small fixes (txpool result not iterable, rpc validation for exchangeTransitionConfiguration) (#1793)

* engine: add validation for exchangeTransitionConfiguration

* create separate type for test utils type StartRPCOpts

* TxPool: fix `(intermediate value) is not iterable` error on `await getPooledTransactions`

Author: ryanio

packages/client/lib/rpc/modules/engine.ts

@@ -256,7 +256,16 @@ export class Engine {
 
     this.exchangeTransitionConfigurationV1 = middleware(
       this.exchangeTransitionConfigurationV1.bind(this),
-      0
+      1,
+      [
+        [
+          validators.object({
+            terminalTotalDifficulty: validators.hex,
+            terminalBlockHash: validators.hex,
+            terminalBlockNumber: validators.hex,
+          }),
+        ],
+      ]
     )
   }
 

packages/client/lib/sync/txpool.ts

@@ -8,7 +8,6 @@ import {
 import { Address, BN } from 'ethereumjs-util'
 import { Config } from '../config'
 import { Peer } from '../net/peer'
-import { EthProtocolMethods } from '../net/protocol'
 import type { PeerPool } from '../net/peerpool'
 import type { Block } from '@ethereumjs/block'
 import type { StateManager } from '@ethereumjs/vm/dist/state'
@@ -369,16 +368,16 @@ export class TxPool {
     this.config.logger.debug(
       `TxPool: requesting txs number=${reqHashes.length} pending=${this.pending.length}`
     )
-    const [_, txs] = await (peer!.eth as EthProtocolMethods).getPooledTransactions({
+    const getPooledTxs = await peer.eth!.getPooledTransactions({
       hashes: reqHashes.slice(0, this.TX_RETRIEVAL_LIMIT),
     })
 
-    this.config.logger.debug(`TxPool: received requested txs number=${txs.length}`)
-
     // Remove from pending list regardless if tx is in result
-    for (const reqHashStr of reqHashesStr) {
-      this.pending = this.pending.filter((hash) => hash !== reqHashStr)
-    }
+    this.pending = this.pending.filter((hash) => !reqHashesStr.includes(hash))
+
+    if (!getPooledTxs) return
+    const [_, txs] = getPooledTxs
+    this.config.logger.debug(`TxPool: received requested txs number=${txs.length}`)
 
     const newTxHashes = []
     for (const tx of txs) {

packages/client/test/rpc/helpers.ts

@@ -22,13 +22,15 @@ const level = require('level-mem')
 const config: any = {}
 config.logger = getLogger(config)
 
+type StartRPCOpts = { port?: number; wsServer?: boolean }
 type WithEngineMiddleware = { jwtSecret: Buffer; unlessFn?: (req: IncomingMessage) => boolean }
 
 export function startRPC(
   methods: any,
-  { port, wsServer }: { port?: number; wsServer?: boolean } = { port: 3000 },
+  opts: StartRPCOpts = { port: 3000 },
   withEngineMiddleware?: WithEngineMiddleware
 ) {
+  const { port, wsServer } = opts
   const server = new RPCServer(methods)
   const httpServer = wsServer
     ? createWsRPCServerListener({ server, withEngineMiddleware })