Client: make JSON-RPC payload limits configurable for eth and engine servers

Author: ether-wan

packages/client/bin/repl.ts

@@ -42,6 +42,8 @@ const setupClient = async (
     jwtSecret: '',
     rpcEngineAuth: false,
     rpcCors: '',
+    rpcEthMaxPayload: args.rpcEthMaxPayload ?? '5mb',
+    rpcEngineMaxPayload: args.rpcEngineMaxPayload ?? '15mb',
   })
 
   return { client, executionRPC: servers[0], engineRPC: servers[1] }

packages/client/bin/startRPC.ts

@@ -37,6 +37,8 @@ export type RPCArgs = {
   jwtSecret?: string
   rpcEngineAuth: boolean
   rpcCors: string
+  rpcEthMaxPayload: string
+  rpcEngineMaxPayload: string
 }
 
 /**
@@ -97,7 +99,10 @@ export function startRPCServers(client: EthereumClient, args: RPCArgs) {
     rpcCors,
     rpcDebug,
     rpcDebugVerbose,
+    rpcEthMaxPayload,
+    rpcEngineMaxPayload,
   } = args
+
   const manager = new RPCManager(client, config)
   const { logger } = config
   const jwtSecret =
@@ -136,6 +141,7 @@ export function startRPCServers(client: EthereumClient, args: RPCArgs) {
                     : req.body.method.includes('engine_') === false,
               }
             : undefined,
+        maxPayload: rpcEthMaxPayload,
       })
       rpcHttpServer.listen(rpcPort, rpcAddr)
       logger.info(
@@ -191,6 +197,7 @@ export function startRPCServers(client: EthereumClient, args: RPCArgs) {
             jwtSecret,
           }
         : undefined,
+      maxPayload: rpcEngineMaxPayload,
     })
     rpcHttpServer.listen(rpcEnginePort, rpcEngineAddr)
     logger.info(

packages/client/bin/utils.ts

@@ -196,6 +196,16 @@ export function getArgs(): ClientOpts {
         boolean: true,
         default: true,
       })
+      .option('rpcEthMaxPayload', {
+        describe: 'Define max JSON payload size for eth/debug RPC requests',
+        string: true,
+        default: '5mb',
+      })
+      .option('rpcEngineMaxPayload', {
+        describe: 'Define max JSON payload size for engine RPC requests',
+        string: true,
+        default: '15mb',
+      })
       .option('jwtSecret', {
         describe: 'Provide a file containing a hex encoded jwt secret for Engine RPC server',
         coerce: (arg: string) => (arg ? path.resolve(arg) : undefined),

packages/client/src/config.ts

@@ -346,6 +346,16 @@ export interface ConfigOptions {
    * Enables Prometheus Metrics that can be collected for monitoring client health
    */
   prometheusMetrics?: PrometheusMetrics
+
+  /**
+   * Max JSON payload size for eth/eth RPC requests (untrusted)
+   */
+  rpcEthMaxPayload?: string
+
+  /*
+   * Max JSON payload size for engine RPC requests (trusted)
+   */
+  rpcEngineMaxPayload?: string
 }
 
 export class Config {
@@ -356,7 +366,7 @@ export class Config {
   public readonly events: EventEmitter<EventParams>
 
   public static readonly CHAIN_DEFAULT = Mainnet
-  public static readonly SYNCMODE_DEFAULT = SyncMode.Full
+  public static readonly SYNCMODE_DEFAULT = SyncMode.None
   public static readonly DATADIR_DEFAULT = `./datadir`
   public static readonly PORT_DEFAULT = 30303
   public static readonly MAXPERREQUEST_DEFAULT = 100
@@ -365,6 +375,8 @@ export class Config {
   public static readonly MINPEERS_DEFAULT = 1
   public static readonly MAXPEERS_DEFAULT = 25
   public static readonly DNSADDR_DEFAULT = '8.8.8.8'
+  public static readonly RPC_ETH_MAXPAYLOAD_DEFAULT = '5mb'
+  public static readonly RPC_ENGINE_MAXPAYLOAD_DEFAULT = '15mb'
   public static readonly EXECUTION = true
   public static readonly NUM_BLOCKS_PER_ITERATION = 100
   public static readonly ACCOUNT_CACHE = 400000
@@ -458,6 +470,9 @@ export class Config {
 
   public readonly blobsAndProofsCacheBlocks: number
 
+  public readonly rpcEthMaxPayload: string
+  public readonly rpcEngineMaxPayload: string
+
   public synchronized: boolean
   public lastSynchronized?: boolean
   /** lastSyncDate in ms */
@@ -563,6 +578,9 @@ export class Config {
     this.blobsAndProofsCacheBlocks =
       options.blobsAndProofsCacheBlocks ?? Config.BLOBS_AND_PROOFS_CACHE_BLOCKS
 
+    this.rpcEthMaxPayload = options.rpcEthMaxPayload ?? Config.RPC_ETH_MAXPAYLOAD_DEFAULT
+    this.rpcEngineMaxPayload = options.rpcEngineMaxPayload ?? Config.RPC_ENGINE_MAXPAYLOAD_DEFAULT
+
     this.discDns = this.getDnsDiscovery(options.discDns)
     this.discV4 = options.discV4 ?? true
 

packages/client/src/types.ts

@@ -148,6 +148,8 @@ export interface ClientOpts {
   skipEngineExec?: boolean
   ignoreStatelessInvalidExecs?: boolean
   useJsCrypto?: boolean
+  rpcEthMaxPayload?: string
+  rpcEngineMaxPayload?: string
 }
 
 export type PrometheusMetrics = {

packages/client/src/util/rpc.ts

@@ -33,6 +33,7 @@ type CreateRPCServerListenerOpts = {
   withEngineMiddleware?: WithEngineMiddleware
 }
 type CreateWSServerOpts = CreateRPCServerListenerOpts & { httpServer?: jayson.HttpServer }
+type CreateHTTPServerOpts = CreateRPCServerListenerOpts & { maxPayload: string }
 type WithEngineMiddleware = { jwtSecret: Uint8Array; unlessFn?: (req: IncomingMessage) => boolean }
 
 export type MethodConfig = (typeof MethodConfig)[keyof typeof MethodConfig]
@@ -182,13 +183,13 @@ function checkHeaderAuth(req: any, jwtSecret: Uint8Array): void {
   }
 }
 
-export function createRPCServerListener(opts: CreateRPCServerListenerOpts): jayson.HttpServer {
-  const { server, withEngineMiddleware, RPCCors } = opts
+export function createRPCServerListener(opts: CreateHTTPServerOpts): jayson.HttpServer {
+  const { server, withEngineMiddleware, RPCCors, maxPayload } = opts
 
   const app = Connect()
   if (typeof RPCCors === 'string') app.use(cors({ origin: RPCCors }))
   // GOSSIP_MAX_SIZE_BELLATRIX is proposed to be 10MiB
-  app.use(JSONParser({ limit: '11mb' }))
+  app.use(JSONParser({ limit: maxPayload }))
 
   if (withEngineMiddleware) {
     const { jwtSecret, unlessFn } = withEngineMiddleware

packages/client/test/util/rpc.spec.ts

@@ -32,6 +32,7 @@ describe('[Util/RPC]', () => {
         const httpServer = createRPCServerListener({
           server,
           withEngineMiddleware: { jwtSecret: new Uint8Array(32) },
+          maxPayload: '15mb',
         })
         const wsServer = createWsRPCServerListener({
           server,
@@ -74,6 +75,7 @@ describe('[Util/RPC]', () => {
     const httpServer = createRPCServerListener({
       server,
       withEngineMiddleware: { jwtSecret: new Uint8Array(32) },
+      maxPayload: '15mb',
     })
     const wsServer = createWsRPCServerListener({
       server,