diff --git a/.golangci.yml b/.golangci.yml
index c80e60edd..7a94ed81d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -32,6 +32,15 @@ linters:
       - common-false-positives
       - legacy
       - std-error-handling
+    rules:
+      - path: internal/jsonrpc/api/.*\.go
+        text: avoid meaningless package names
+        linters:
+          - revive
+      - path: internal/jsonrpc/.*\.go
+        text: avoid package names that conflict with Go standard library package names
+        linters:
+          - revive
     paths:
       - third_party$
       - builtin$
diff --git a/cmd/cartesi-rollups-cli/root/app/execution-parameters/execution_parameters.go b/cmd/cartesi-rollups-cli/root/app/execution-parameters/execution_parameters.go
index 9f6330d34..526af11dc 100644
--- a/cmd/cartesi-rollups-cli/root/app/execution-parameters/execution_parameters.go
+++ b/cmd/cartesi-rollups-cli/root/app/execution-parameters/execution_parameters.go
@@ -72,7 +72,7 @@ func init() {
 
 }
 
-func run(cmd *cobra.Command, args []string) {
+func run(cmd *cobra.Command, _ []string) {
 	// If no subcommand is provided, show help
 	err := cmd.Help()
 	cobra.CheckErr(err)
@@ -82,7 +82,7 @@ func run(cmd *cobra.Command, args []string) {
 var getCmd = &cobra.Command{
 	Use:   "get [application] [parameter]",
 	Short: "Get a specific configuration parameter",
-	Args:  cobra.ExactArgs(2), // nolint: mnd
+	Args:  cobra.ExactArgs(2), //nolint:mnd
 	Run:   runGet,
 	Long: `
 Supported Environment Variables:
@@ -93,7 +93,7 @@ Supported Environment Variables:
 var setCmd = &cobra.Command{
 	Use:   "set [application] [parameter] [value]",
 	Short: "Set a specific configuration parameter",
-	Args:  cobra.ExactArgs(3), // nolint: mnd
+	Args:  cobra.ExactArgs(3), //nolint:mnd
 	Run:   runSet,
 	Long: `
 Supported Environment Variables:
@@ -157,7 +157,8 @@ func runGet(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	if app == nil {
 		fmt.Fprintf(os.Stderr, "application %q not found\n", nameOrAddress)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	params, err := repo.GetExecutionParameters(ctx, app.ID)
@@ -194,7 +195,8 @@ func runSet(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	if app == nil {
 		fmt.Fprintf(os.Stderr, "application %q not found\n", nameOrAddress)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	params, err := repo.GetExecutionParameters(ctx, app.ID)
@@ -230,7 +232,8 @@ func runList(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	if app == nil {
 		fmt.Fprintf(os.Stderr, "application %q not found\n", nameOrAddress)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	params, err := repo.GetExecutionParameters(ctx, app.ID)
@@ -256,7 +259,8 @@ func runDump(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	if app == nil {
 		fmt.Fprintf(os.Stderr, "application %q not found\n", nameOrAddress)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	params, err := repo.GetExecutionParameters(ctx, app.ID)
@@ -284,7 +288,8 @@ func runLoad(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	if app == nil {
 		fmt.Fprintf(os.Stderr, "application %q not found\n", nameOrAddress)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	// Read JSON from stdin with size limit to prevent memory exhaustion
diff --git a/cmd/cartesi-rollups-cli/root/app/list/list.go b/cmd/cartesi-rollups-cli/root/app/list/list.go
index 7c535ca6d..b520248cb 100644
--- a/cmd/cartesi-rollups-cli/root/app/list/list.go
+++ b/cmd/cartesi-rollups-cli/root/app/list/list.go
@@ -1,7 +1,7 @@
 // (c) Cartesi and individual authors (see AUTHORS)
 // SPDX-License-Identifier: Apache-2.0 (see LICENSE)
 
-package list
+package list //nolint:revive // The package implements the CLI's "list" subcommand.
 
 import (
 	"encoding/json"
@@ -36,7 +36,7 @@ func init() {
 	})
 }
 
-func run(cmd *cobra.Command, args []string) {
+func run(cmd *cobra.Command, _ []string) {
 	ctx := cmd.Context()
 
 	dsn, err := config.GetDatabaseConnection()
diff --git a/cmd/cartesi-rollups-cli/root/app/register/register.go b/cmd/cartesi-rollups-cli/root/app/register/register.go
index a2122f60d..73db034ff 100644
--- a/cmd/cartesi-rollups-cli/root/app/register/register.go
+++ b/cmd/cartesi-rollups-cli/root/app/register/register.go
@@ -82,7 +82,7 @@ func init() {
 		"Application template hash. (DO NOT USE IN PRODUCTION)\nThis value is retrieved from the application contract",
 	)
 
-	Cmd.Flags().Uint64VarP(&epochLength, "epoch-length", "e", 0, // nolint: mnd
+	Cmd.Flags().Uint64VarP(&epochLength, "epoch-length", "e", 0,
 		"Consensus Epoch length. (DO NOT USE IN PRODUCTION)\nThis value is retrieved from the consensus contract",
 	)
 
@@ -121,7 +121,7 @@ func init() {
 	})
 }
 
-func run(cmd *cobra.Command, args []string) {
+func run(cmd *cobra.Command, _ []string) {
 	ctx := cmd.Context()
 
 	validName, err := config.ToApplicationNameFromString(name)
@@ -181,7 +181,8 @@ func run(cmd *cobra.Command, args []string) {
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Failed to get epoch length from consensus: %v\n",
 				cli.DecorateRevert(err, iconsensus.IConsensusMetaData))
-			os.Exit(1)
+			repo.Close()
+			os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 		}
 	}
 
@@ -266,7 +267,7 @@ func run(cmd *cobra.Command, args []string) {
 		if executionParametersFileParam == "-" {
 			filePath = os.Stdin.Name()
 		}
-		contents, err := os.ReadFile(filePath)
+		contents, err := os.ReadFile(filePath) //nolint:gosec // The CLI user explicitly supplies this path.
 		cobra.CheckErr(err)
 
 		decoder := json.NewDecoder(strings.NewReader(string(contents)))
diff --git a/cmd/cartesi-rollups-cli/root/app/remove/remove.go b/cmd/cartesi-rollups-cli/root/app/remove/remove.go
index 79ebc7800..ef9ae2a49 100644
--- a/cmd/cartesi-rollups-cli/root/app/remove/remove.go
+++ b/cmd/cartesi-rollups-cli/root/app/remove/remove.go
@@ -62,11 +62,13 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	if app == nil {
 		fmt.Fprintf(os.Stderr, "application %q not found\n", nameOrAddress)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	if app.Enabled {
 		fmt.Fprintf(os.Stderr, "Error: Application %s has enabled=true. Must disable it first\n", app.Name)
+		repo.Close()
 		os.Exit(1)
 	}
 
diff --git a/cmd/cartesi-rollups-cli/root/app/status/status.go b/cmd/cartesi-rollups-cli/root/app/status/status.go
index 484f7e521..7ba3482d5 100644
--- a/cmd/cartesi-rollups-cli/root/app/status/status.go
+++ b/cmd/cartesi-rollups-cli/root/app/status/status.go
@@ -22,7 +22,7 @@ var Cmd = &cobra.Command{
 	Use:     "status [app-name-or-address] [new-status]",
 	Short:   "Display application status or set the enabled flag",
 	Example: examples,
-	Args:    cobra.RangeArgs(1, 2), // nolint: mnd
+	Args:    cobra.RangeArgs(1, 2), //nolint:mnd
 	Run:     run,
 	Long: `
 Supported Environment Variables:
@@ -67,7 +67,8 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	if app == nil {
 		fmt.Fprintf(os.Stderr, "application %q not found\n", nameOrAddress)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	// If no new status is provided, display the current status, operator
@@ -93,6 +94,7 @@ func run(cmd *cobra.Command, args []string) {
 				fmt.Printf("Accounts drive merkle root: %s\n", app.AccountsDriveMerkleRoot.Hex())
 			}
 		}
+		repo.Close()
 		os.Exit(0)
 	}
 
@@ -107,11 +109,13 @@ func run(cmd *cobra.Command, args []string) {
 		targetEnabled = false
 	default:
 		fmt.Fprintf(os.Stderr, "Error: Invalid status %q. Valid values are 'enabled' or 'disabled'\n", newStatus)
+		repo.Close()
 		os.Exit(1)
 	}
 
 	if app.Enabled == targetEnabled && (app.Status != model.ApplicationStatus_Failed || !targetEnabled) {
 		fmt.Printf("Application %s enabled flag is already %t\n", app.Name, app.Enabled)
+		repo.Close()
 		os.Exit(0)
 	}
 
@@ -126,10 +130,12 @@ func run(cmd *cobra.Command, args []string) {
 		confirmed, err := cli.ConfirmPrompt("Proceed?")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error reading input: %v\n", err)
+			repo.Close()
 			os.Exit(1)
 		}
 		if !confirmed {
 			fmt.Println("Aborted.")
+			repo.Close()
 			os.Exit(0)
 		}
 	}
diff --git a/cmd/cartesi-rollups-cli/root/contract/contract.go b/cmd/cartesi-rollups-cli/root/contract/contract.go
index 3e7ceb540..1c0420e70 100644
--- a/cmd/cartesi-rollups-cli/root/contract/contract.go
+++ b/cmd/cartesi-rollups-cli/root/contract/contract.go
@@ -161,7 +161,7 @@ func computeIConsensusV3InterfaceID() [4]byte {
 		if !ok {
 			panic(fmt.Errorf("computeIConsensusV3InterfaceID: method %q not found in IConsensus ABI", name))
 		}
-		if len(m.ID) != 4 {
+		if len(m.ID) != 4 { //nolint:mnd // ABI method selectors are exactly four bytes.
 			panic(fmt.Errorf("computeIConsensusV3InterfaceID: method %q selector is %d bytes, expected 4", name, len(m.ID)))
 		}
 		for i := range 4 {
diff --git a/cmd/cartesi-rollups-cli/root/db/check/check.go b/cmd/cartesi-rollups-cli/root/db/check/check.go
index 1855afdc5..69da6b658 100644
--- a/cmd/cartesi-rollups-cli/root/db/check/check.go
+++ b/cmd/cartesi-rollups-cli/root/db/check/check.go
@@ -30,7 +30,7 @@ func init() {
 	})
 }
 
-func run(cmd *cobra.Command, args []string) {
+func run(_ *cobra.Command, _ []string) {
 	dsnURL, err := config.GetDatabaseConnection()
 	cobra.CheckErr(err)
 
@@ -40,13 +40,13 @@ func run(cmd *cobra.Command, args []string) {
 		if err == nil {
 			break
 		}
-		if i == 4 { // nolint: mnd
+		if i == 4 { //nolint:mnd
 			fmt.Fprintf(os.Stderr, "Failed to connect to database. (%s)\n", dsnURL)
 			os.Exit(1)
 		}
 		fmt.Fprintf(os.Stderr, "Connection to database failed. Trying again... (%s)\n", dsnURL)
 		// wait before retrying
-		time.Sleep(5 * time.Second) // nolint: mnd
+		time.Sleep(5 * time.Second) //nolint:mnd
 	}
 	defer s.Close()
 
diff --git a/cmd/cartesi-rollups-cli/root/db/init/init.go b/cmd/cartesi-rollups-cli/root/db/init/init.go
index 809790507..38399feaa 100644
--- a/cmd/cartesi-rollups-cli/root/db/init/init.go
+++ b/cmd/cartesi-rollups-cli/root/db/init/init.go
@@ -35,7 +35,7 @@ func init() {
 	})
 }
 
-func run(cmd *cobra.Command, args []string) {
+func run(_ *cobra.Command, _ []string) {
 	var s *schema.Schema
 	var err error
 
@@ -47,13 +47,13 @@ func run(cmd *cobra.Command, args []string) {
 		if err == nil {
 			break
 		}
-		if i == 4 { // nolint: mnd
+		if i == 4 { //nolint:mnd
 			fmt.Fprintf(os.Stderr, "Failed to connect to database. (%s)\n", dsnURL)
 			os.Exit(1)
 		}
 		fmt.Fprintf(os.Stderr, "Connection to database failed. Trying again... (%s)\n", dsnURL)
 		// wait before retrying
-		time.Sleep(5 * time.Second) // nolint: mnd
+		time.Sleep(5 * time.Second) //nolint:mnd
 	}
 	defer s.Close()
 
diff --git a/cmd/cartesi-rollups-cli/root/deploy/application.go b/cmd/cartesi-rollups-cli/root/deploy/application.go
index 991a3b538..ec26b27f0 100644
--- a/cmd/cartesi-rollups-cli/root/deploy/application.go
+++ b/cmd/cartesi-rollups-cli/root/deploy/application.go
@@ -47,7 +47,7 @@ var applicationCmd = &cobra.Command{
 	Short: "Deploy a new application and register it into the database",
 
 	Args: func(cmd *cobra.Command, args []string) error {
-		if !(0 <= len(args) && len(args) <= 2) {
+		if len(args) > 2 { //nolint:mnd // The command accepts at most two positional arguments.
 			return fmt.Errorf("error on argument count. Expected at most two positional arguments")
 		}
 		return cobra.OnlyValidArgs(cmd, args)
@@ -64,6 +64,7 @@ Supported Environment Variables:
   CARTESI_CONTRACTS_DAVE_APP_FACTORY_ADDRESS                 Dave Application Factory address`,
 }
 
+//nolint:lll // Long CLI examples are kept copy-pasteable.
 const applicationExamples = `
 # deploy both application and authority contracts together via self hosted application contract, then register the application
  - cartesi-rollups-cli deploy application echo-dapp applications/echo-dapp/
@@ -142,17 +143,17 @@ func runDeployApplication(cmd *cobra.Command, args []string) {
 	client, err := ethclient.DialContext(ctx, ethEndpoint.Raw())
 	cobra.CheckErr(err)
 
-	chainId, err := client.ChainID(ctx)
+	chainID, err := client.ChainID(ctx)
 	cobra.CheckErr(err)
 
-	txOpts, err := cli.GetTransactOpts(ctx, chainId)
+	txOpts, err := cli.GetTransactOpts(ctx, chainID)
 	cobra.CheckErr(err)
 
 	// pre deployment checks
 	if len(args) >= 1 {
 		applicationName = args[0]
 	}
-	if len(args) >= 2 {
+	if len(args) >= 2 { //nolint:mnd // The optional second argument is the template path.
 		templateURI = args[1]
 	}
 
@@ -162,6 +163,7 @@ func runDeployApplication(cmd *cobra.Command, args []string) {
 		cobra.CheckErr(err)
 
 		dsn, err := config.GetDatabaseConnection()
+		cobra.CheckErr(err)
 		repo, err := factory.NewRepositoryFromConnectionString(ctx, dsn.Raw())
 		cobra.CheckErr(err)
 		defer repo.Close()
@@ -170,7 +172,7 @@ func runDeployApplication(cmd *cobra.Command, args []string) {
 		cobra.CheckErr(err)
 
 		if applicationInUse != nil {
-			cobra.CheckErr(fmt.Errorf("application name is already in use: %v.", applicationInUse.Name))
+			cobra.CheckErr(fmt.Errorf("application name is already in use: %v", applicationInUse.Name))
 		}
 	}
 
@@ -203,7 +205,7 @@ func runDeployApplication(cmd *cobra.Command, args []string) {
 		if executionParametersFileParam == "-" {
 			filePath = os.Stdin.Name()
 		}
-		contents, err := os.ReadFile(filePath)
+		contents, err := os.ReadFile(filePath) //nolint:gosec // The CLI user explicitly supplies this path.
 		cobra.CheckErr(err)
 
 		decoder := json.NewDecoder(strings.NewReader(string(contents)))
@@ -227,7 +229,7 @@ func runDeployApplication(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 
 	if len(data) == 0 {
-		cobra.CheckErr(fmt.Errorf("No code at the factory address: %v", factoryAddress))
+		cobra.CheckErr(fmt.Errorf("no code at the factory address: %v", factoryAddress))
 	}
 	if verboseParam {
 		fmt.Fprint(os.Stderr, "success\n")
@@ -380,7 +382,7 @@ func buildSelfhostedApplicationDeployment(
 	}
 
 	if !cmd.Flags().Changed("template-hash") {
-		if len(args) >= 2 { // args[1] is mandatory if `template-hash` was absent
+		if len(args) >= 2 { //nolint:mnd // args[1] is mandatory if `template-hash` was absent
 			request.TemplateHash, err = util.ReadRootHash(args[1])
 		} else {
 			err = fmt.Errorf("missing argument. One of `template-path` or `template-hash` is required")
@@ -392,26 +394,26 @@ func buildSelfhostedApplicationDeployment(
 		return nil, fmt.Errorf("error on parameter template-hash: %w", err)
 	}
 
+	var dataAvailabilityErr error
 	if !cmd.Flags().Changed("data-availability") {
-		inputBoxAddress := common.Address{}
-		inputBoxAddress, err = config.GetContractsInputBoxAddress()
+		inputBoxAddress, err := config.GetContractsInputBoxAddress()
 		if err != nil {
 			return nil, fmt.Errorf("error on parameter data-availability: %w", err)
 		}
-		request.InputBoxAddress, request.IInputBoxBlock, request.DataAvailability, err =
+		request.InputBoxAddress, request.IInputBoxBlock, request.DataAvailability, dataAvailabilityErr =
 			ethutil.DefaultDA(client, inputBoxAddress)
 	} else {
-		request.InputBoxAddress, request.IInputBoxBlock, request.DataAvailability, err =
+		request.InputBoxAddress, request.IInputBoxBlock, request.DataAvailability, dataAvailabilityErr =
 			ethutil.CustomDA(client, applicationDataAvailabilityParam)
 	}
-	if err != nil {
-		return nil, fmt.Errorf("error on parameter data-availability: %w", err)
+	if dataAvailabilityErr != nil {
+		return nil, fmt.Errorf("error on parameter data-availability: %w", dataAvailabilityErr)
 	}
 
 	// ensure there is a contract deployed at the input box address
 	code, err := client.CodeAt(ctx, request.InputBoxAddress, nil)
 	if err != nil {
-		return nil, fmt.Errorf("failed to probe input box address for contract: %v\n", err)
+		return nil, fmt.Errorf("failed to probe input box address for contract: %v", err)
 	}
 	if len(code) == 0 {
 		return nil, fmt.Errorf("error input box address has no code: %v", request.InputBoxAddress)
@@ -456,7 +458,7 @@ func buildApplicationOnlyDeployment(
 	}
 
 	if !cmd.Flags().Changed("template-hash") {
-		if len(args) >= 2 { // args[1] is mandatory if `template-hash` was absent
+		if len(args) >= 2 { //nolint:mnd // args[1] is mandatory if `template-hash` was absent
 			request.TemplateHash, err = util.ReadRootHash(args[1])
 		} else {
 			err = fmt.Errorf("missing argument. One of `template-path` or `template-hash` is required")
@@ -477,26 +479,26 @@ func buildApplicationOnlyDeployment(
 		return nil, fmt.Errorf("error on parameter application-owner: %w", err)
 	}
 
+	var dataAvailabilityErr error
 	if !cmd.Flags().Changed("data-availability") {
-		inputBoxAddress := common.Address{}
-		inputBoxAddress, err = config.GetContractsInputBoxAddress()
+		inputBoxAddress, err := config.GetContractsInputBoxAddress()
 		if err != nil {
 			return nil, fmt.Errorf("error on parameter data-availability: %w", err)
 		}
-		request.InputBoxAddress, request.IInputBoxBlock, request.DataAvailability, err =
+		request.InputBoxAddress, request.IInputBoxBlock, request.DataAvailability, dataAvailabilityErr =
 			ethutil.DefaultDA(client, inputBoxAddress)
 	} else {
-		request.InputBoxAddress, request.IInputBoxBlock, request.DataAvailability, err =
+		request.InputBoxAddress, request.IInputBoxBlock, request.DataAvailability, dataAvailabilityErr =
 			ethutil.CustomDA(client, applicationDataAvailabilityParam)
 	}
-	if err != nil {
-		return nil, fmt.Errorf("error on parameter data-availability: %w", err)
+	if dataAvailabilityErr != nil {
+		return nil, fmt.Errorf("error on parameter data-availability: %w", dataAvailabilityErr)
 	}
 
 	// ensure there is a contract deployed at the input box address
 	code, err := client.CodeAt(ctx, request.InputBoxAddress, nil)
 	if err != nil {
-		return nil, fmt.Errorf("failed to probe input box address for contract: %v\n", err)
+		return nil, fmt.Errorf("failed to probe input box address for contract: %v", err)
 	}
 	if len(code) == 0 {
 		return nil, fmt.Errorf("error input box address has no code: %v", request.InputBoxAddress)
@@ -544,7 +546,7 @@ func buildPrtApplicationDeployment(
 	}
 
 	if !cmd.Flags().Changed("template-hash") {
-		if len(args) >= 2 { // args[1] is mandatory if `template-hash` was absent
+		if len(args) >= 2 { //nolint:mnd // args[1] is mandatory if `template-hash` was absent
 			request.TemplateHash, err = util.ReadRootHash(args[1])
 		} else {
 			err = fmt.Errorf("missing argument. One of `template-path` or `template-hash` is required")
diff --git a/cmd/cartesi-rollups-cli/root/deploy/authority.go b/cmd/cartesi-rollups-cli/root/deploy/authority.go
index 9955cb93b..8a00f22e6 100644
--- a/cmd/cartesi-rollups-cli/root/deploy/authority.go
+++ b/cmd/cartesi-rollups-cli/root/deploy/authority.go
@@ -33,6 +33,7 @@ Supported Environment Variables:
   CARTESI_CONTRACTS_AUTHORITY_FACTORY_ADDRESS    Authority Factory Address`,
 }
 
+//nolint:lll // Long CLI examples are kept copy-pasteable.
 const authorityExamples = `
 # deploy a new authority contract
  - cli deploy authority
@@ -58,7 +59,7 @@ func init() {
 	})
 }
 
-func runDeployAuthority(cmd *cobra.Command, args []string) {
+func runDeployAuthority(cmd *cobra.Command, _ []string) {
 	var err error
 
 	ctx := cmd.Context()
@@ -69,10 +70,10 @@ func runDeployAuthority(cmd *cobra.Command, args []string) {
 	client, err := ethclient.DialContext(ctx, ethEndpoint.Raw())
 	cobra.CheckErr(err)
 
-	chainId, err := client.ChainID(ctx)
+	chainID, err := client.ChainID(ctx)
 	cobra.CheckErr(err)
 
-	txOpts, err := cli.GetTransactOpts(ctx, chainId)
+	txOpts, err := cli.GetTransactOpts(ctx, chainID)
 	cobra.CheckErr(err)
 
 	deployment, err := buildAuthorityDeployment(cmd, txOpts)
@@ -94,7 +95,7 @@ func runDeployAuthority(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 
 	if len(data) == 0 {
-		cobra.CheckErr(fmt.Errorf("No code at the factory address: %v", factoryAddress))
+		cobra.CheckErr(fmt.Errorf("no code at the factory address: %v", factoryAddress))
 	}
 	if verboseParam {
 		fmt.Fprint(os.Stderr, "success\n")
diff --git a/cmd/cartesi-rollups-cli/root/deploy/deploy.go b/cmd/cartesi-rollups-cli/root/deploy/deploy.go
index 1c77e1e4d..1d575ef3a 100644
--- a/cmd/cartesi-rollups-cli/root/deploy/deploy.go
+++ b/cmd/cartesi-rollups-cli/root/deploy/deploy.go
@@ -27,9 +27,9 @@ var Cmd = &cobra.Command{
 }
 
 func init() {
-	Cmd.PersistentFlags().Uint64VarP(&epochLengthParam, "epoch-length", "", 10, // nolint: mnd
+	Cmd.PersistentFlags().Uint64VarP(&epochLengthParam, "epoch-length", "", 10, //nolint:mnd
 		"Epoch length")
-	Cmd.PersistentFlags().MarkHidden("epoch-length")
+	cobra.CheckErr(Cmd.PersistentFlags().MarkHidden("epoch-length"))
 	Cmd.PersistentFlags().Uint64Var(&claimStagingPeriodParam, "claim-staging-period", 0,
 		"Number of blocks between a claim being submitted and accepted (Authority/Quorum only)")
 	Cmd.PersistentFlags().StringVar(&withdrawalConfigParam, "withdrawal-config", "",
@@ -39,20 +39,20 @@ func init() {
 		"Path to a JSON file describing the WithdrawalConfig. Mutually exclusive with --withdrawal-config.")
 	Cmd.PersistentFlags().StringVar(&saltParam, "salt", "0000000000000000000000000000000000000000000000000000000000000000",
 		"Salt value for contract deployment")
-	Cmd.PersistentFlags().MarkHidden("salt")
+	cobra.CheckErr(Cmd.PersistentFlags().MarkHidden("salt"))
 	Cmd.PersistentFlags().BoolVarP(&asJSONParam, "json", "", false,
 		"Print results as JSON")
-	Cmd.PersistentFlags().MarkHidden("json")
+	cobra.CheckErr(Cmd.PersistentFlags().MarkHidden("json"))
 	Cmd.PersistentFlags().BoolVarP(&verboseParam, "verbose", "", false,
 		"Print extra information")
-	Cmd.PersistentFlags().MarkHidden("verbose")
+	cobra.CheckErr(Cmd.PersistentFlags().MarkHidden("verbose"))
 
 	Cmd.AddCommand(applicationCmd)
 	Cmd.AddCommand(authorityCmd)
 	Cmd.AddCommand(quorumCmd)
 }
 
-func run(cmd *cobra.Command, args []string) {
+func run(cmd *cobra.Command, _ []string) {
 	// If no subcommand is provided, show help
 	err := cmd.Help()
 	cobra.CheckErr(err)
diff --git a/cmd/cartesi-rollups-cli/root/deploy/quorum.go b/cmd/cartesi-rollups-cli/root/deploy/quorum.go
index 698125248..185cae245 100644
--- a/cmd/cartesi-rollups-cli/root/deploy/quorum.go
+++ b/cmd/cartesi-rollups-cli/root/deploy/quorum.go
@@ -58,7 +58,7 @@ func init() {
 	})
 }
 
-func runDeployQuorum(cmd *cobra.Command, args []string) {
+func runDeployQuorum(cmd *cobra.Command, _ []string) {
 	var err error
 
 	ctx := cmd.Context()
@@ -92,7 +92,7 @@ func runDeployQuorum(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 
 	if len(data) == 0 {
-		cobra.CheckErr(fmt.Errorf("No code at the factory address: %v", factoryAddress))
+		cobra.CheckErr(fmt.Errorf("no code at the factory address: %v", factoryAddress))
 	}
 	if verboseParam {
 		fmt.Fprint(os.Stderr, "success\n")
diff --git a/cmd/cartesi-rollups-cli/root/deposit/deposit.go b/cmd/cartesi-rollups-cli/root/deposit/deposit.go
index cbaac1c31..536717419 100644
--- a/cmd/cartesi-rollups-cli/root/deposit/deposit.go
+++ b/cmd/cartesi-rollups-cli/root/deposit/deposit.go
@@ -217,7 +217,7 @@ func parseAmount(value string) (*big.Int, error) {
 		}
 	} else {
 		var ok bool
-		amount, ok = new(big.Int).SetString(value, 10)
+		amount, ok = new(big.Int).SetString(value, 10) //nolint:mnd // User-facing amounts are decimal.
 		if !ok {
 			return nil, fmt.Errorf("invalid amount %q", value)
 		}
diff --git a/cmd/cartesi-rollups-cli/root/execute/execute.go b/cmd/cartesi-rollups-cli/root/execute/execute.go
index 451abe678..f9891c60c 100644
--- a/cmd/cartesi-rollups-cli/root/execute/execute.go
+++ b/cmd/cartesi-rollups-cli/root/execute/execute.go
@@ -22,7 +22,7 @@ var Cmd = &cobra.Command{
 	Use:     "execute [app-name-or-address] [output-index]",
 	Short:   "Executes a voucher",
 	Example: examples,
-	Args:    cobra.ExactArgs(2), // nolint: mnd
+	Args:    cobra.ExactArgs(2), //nolint:mnd
 	Run:     run,
 	Long: `
 Supported Environment Variables:
@@ -81,7 +81,8 @@ func run(cmd *cobra.Command, args []string) {
 
 	if output == nil {
 		fmt.Fprintf(os.Stderr, "The output with index %d was not found in the database\n", outputIndex)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	app, err := repo.GetApplication(ctx, nameOrAddress)
@@ -95,10 +96,10 @@ func run(cmd *cobra.Command, args []string) {
 	client, err := ethclient.DialContext(ctx, ethEndpoint.Raw())
 	cobra.CheckErr(err)
 
-	chainId, err := client.ChainID(ctx)
+	chainID, err := client.ChainID(ctx)
 	cobra.CheckErr(err)
 
-	txOpts, err := cli.GetTransactOpts(ctx, chainId)
+	txOpts, err := cli.GetTransactOpts(ctx, chainID)
 	cobra.CheckErr(err)
 
 	if !skipConfirmation {
diff --git a/cmd/cartesi-rollups-cli/root/foreclose/foreclose.go b/cmd/cartesi-rollups-cli/root/foreclose/foreclose.go
index 2917e4e8b..cd63eb2fd 100644
--- a/cmd/cartesi-rollups-cli/root/foreclose/foreclose.go
+++ b/cmd/cartesi-rollups-cli/root/foreclose/foreclose.go
@@ -86,10 +86,10 @@ func run(cmd *cobra.Command, args []string) {
 	client, err := ethclient.DialContext(ctx, ethEndpoint.Raw())
 	cobra.CheckErr(err)
 
-	chainId, err := client.ChainID(ctx)
+	chainID, err := client.ChainID(ctx)
 	cobra.CheckErr(err)
 
-	txOpts, err := cli.GetTransactOpts(ctx, chainId)
+	txOpts, err := cli.GetTransactOpts(ctx, chainID)
 	cobra.CheckErr(err)
 
 	appContract, err := iapplication.NewIApplication(appAddr, client)
diff --git a/cmd/cartesi-rollups-cli/root/provedriveroot/provedriveroot.go b/cmd/cartesi-rollups-cli/root/provedriveroot/provedriveroot.go
index 3a2714e5d..05a995b9a 100644
--- a/cmd/cartesi-rollups-cli/root/provedriveroot/provedriveroot.go
+++ b/cmd/cartesi-rollups-cli/root/provedriveroot/provedriveroot.go
@@ -146,7 +146,7 @@ func run(cmd *cobra.Command, args []string) {
 }
 
 func loadProof(path string) ([32]byte, [][32]byte, error) {
-	raw, err := os.ReadFile(path) //nolint:gosec
+	raw, err := os.ReadFile(path)
 	if err != nil {
 		return [32]byte{}, nil, fmt.Errorf("read proof file %s: %w", path, err)
 	}
diff --git a/cmd/cartesi-rollups-cli/root/read/commitments/commitments.go b/cmd/cartesi-rollups-cli/root/read/commitments/commitments.go
index 5f6a31939..c0417fd10 100644
--- a/cmd/cartesi-rollups-cli/root/read/commitments/commitments.go
+++ b/cmd/cartesi-rollups-cli/root/read/commitments/commitments.go
@@ -35,6 +35,7 @@ Supported Environment Variables:
   CARTESI_DATABASE_CONNECTION                    Database connection string`,
 }
 
+//nolint:lll // Long CLI examples are kept copy-pasteable.
 const examples = `# Read specific commitment:
 cartesi-rollups-cli read commitments echo-dapp 10 0x0073a8637d98649717bdc02ecb439c80aa8a10d0 0xdb99c9cdb2e2070a4e4e633c2e6874648dfe3971d14da843465b3d950df3dd19
 
@@ -75,8 +76,8 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
-		if len(args) > 1 && len(args) < 4 { //nolint: mnd
+	Cmd.PreRunE = func(_ *cobra.Command, args []string) error {
+		if len(args) > 1 && len(args) < 4 {
 			return fmt.Errorf(
 				"expected 1 argument (list) or 4 arguments (get), got %d", len(args))
 		}
@@ -101,7 +102,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 4 {
+	if len(args) >= 4 { //nolint:mnd // Four positional arguments select the get operation.
 		var params api.GetCommitmentParams
 		params.Application = args[0]
 		params.EpochIndex, err = config.AsHexString(args[1])
@@ -138,5 +139,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/epochs/epochs.go b/cmd/cartesi-rollups-cli/root/read/epochs/epochs.go
index 4f1aea19e..751cedb3e 100644
--- a/cmd/cartesi-rollups-cli/root/read/epochs/epochs.go
+++ b/cmd/cartesi-rollups-cli/root/read/epochs/epochs.go
@@ -40,23 +40,23 @@ cartesi-rollups-cli read epochs echo-dapp 10
 cartesi-rollups-cli read epochs echo-dapp
 
 # Read all epochs with filter:
-cartesi-rollups-cli read epochs echo-dapp --status OPEN
+cartesi-rollups-cli read epochs echo-dapp --status OPEN --status CLOSED
 
 # Read all epochs with pagination:
 cartesi-rollups-cli read epochs echo-dapp --limit 10 --offset 10 --descending
 `
 
 var (
-	status     string
+	statuses   []string
 	limit      uint64
 	offset     uint64
 	descending bool
 )
 
 func init() {
-	Cmd.Flags().StringVar(&status, "status", "",
+	Cmd.Flags().StringArrayVar(&statuses, "status", nil,
 		"Filter epochs by status (OPEN, CLOSED, INPUTS_PROCESSED, CLAIM_COMPUTED, CLAIM_SUBMITTED, "+
-			"CLAIM_STAGED, CLAIM_ACCEPTED, CLAIM_REJECTED, CLAIM_FORECLOSED)")
+			"CLAIM_STAGED, CLAIM_ACCEPTED, CLAIM_REJECTED, CLAIM_FORECLOSED); may be specified multiple times")
 	Cmd.Flags().Uint64Var(&limit, "limit", 50, //nolint: mnd
 		"Maximum number of epochs to return")
 	Cmd.Flags().Uint64Var(&offset, "offset", 0,
@@ -71,7 +71,7 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
+	Cmd.PreRunE = func(_ *cobra.Command, _ []string) error {
 		if limit > jsonrpc.LIST_ITEM_LIMIT {
 			return fmt.Errorf("limit cannot exceed %d", jsonrpc.LIST_ITEM_LIMIT)
 		}
@@ -93,7 +93,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 2 {
+	if len(args) >= 2 { //nolint:mnd // Two positional arguments select the get operation.
 		var params api.GetEpochParams
 		params.Application = args[0]
 		params.EpochIndex, err = config.AsHexString(args[1])
@@ -106,7 +106,8 @@ func run(cmd *cobra.Command, args []string) {
 
 		// Add status filter if provided
 		if cmd.Flags().Changed("status") {
-			params.Status = &status
+			epochStatuses := api.StringOrList(statuses)
+			params.Status = &epochStatuses
 		}
 		params.Limit = limit
 		params.Offset = offset
@@ -121,5 +122,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/inputs/inputs.go b/cmd/cartesi-rollups-cli/root/read/inputs/inputs.go
index 199e36692..8b0bf9eda 100644
--- a/cmd/cartesi-rollups-cli/root/read/inputs/inputs.go
+++ b/cmd/cartesi-rollups-cli/root/read/inputs/inputs.go
@@ -77,7 +77,7 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
+	Cmd.PreRunE = func(_ *cobra.Command, _ []string) error {
 		if limit > jsonrpc.LIST_ITEM_LIMIT {
 			return fmt.Errorf("limit cannot exceed %d", jsonrpc.LIST_ITEM_LIMIT)
 		}
@@ -99,7 +99,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 2 {
+	if len(args) >= 2 { //nolint:mnd // Two positional arguments select the get operation.
 		var params api.GetInputParams
 		params.Application = args[0]
 		params.InputIndex, err = config.AsHexString(args[1])
@@ -137,5 +137,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/matchadvances/matchadvances.go b/cmd/cartesi-rollups-cli/root/read/matchadvances/matchadvances.go
index a0e3847e7..d1d2b712c 100644
--- a/cmd/cartesi-rollups-cli/root/read/matchadvances/matchadvances.go
+++ b/cmd/cartesi-rollups-cli/root/read/matchadvances/matchadvances.go
@@ -36,6 +36,7 @@ Supported Environment Variables:
   CARTESI_DATABASE_CONNECTION                    Database connection string`,
 }
 
+//nolint:lll // Long CLI examples are kept copy-pasteable.
 const examples = `# Read specific match advanced:
 cartesi-rollups-cli read match_advances echo-dapp 10 0x0073a8637d98649717bdc02ecb439c80aa8a10d0 0xdb99c9cdb2e2070a4e4e633c2e6874648dfe3971d14da843465b3d950df3dd19 0xdb99c9cdb2e2070a4e4e633c2e6874648dfe3971d14da843465b3d950df3dd19
 
@@ -67,7 +68,7 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
+	Cmd.PreRunE = func(_ *cobra.Command, _ []string) error {
 		if limit > jsonrpc.LIST_ITEM_LIMIT {
 			return fmt.Errorf("limit cannot exceed %d", jsonrpc.LIST_ITEM_LIMIT)
 		}
@@ -89,8 +90,8 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 5 {
-		var params api.GetMatchAdvancedParams
+	if len(args) >= 5 { //nolint:mnd // Five positional arguments select the get operation.
+		var params api.GetMatchAdvanceParams
 		params.Application = args[0]
 		params.EpochIndex, err = config.AsHexString(args[1])
 		cobra.CheckErr(err)
@@ -119,5 +120,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/matches/matches.go b/cmd/cartesi-rollups-cli/root/read/matches/matches.go
index da27db00a..e24c6b933 100644
--- a/cmd/cartesi-rollups-cli/root/read/matches/matches.go
+++ b/cmd/cartesi-rollups-cli/root/read/matches/matches.go
@@ -35,6 +35,7 @@ Supported Environment Variables:
   CARTESI_DATABASE_CONNECTION                    Database connection string`,
 }
 
+//nolint:lll // Long CLI examples are kept copy-pasteable.
 const examples = `# Read specific match:
 cartesi-rollups-cli read matches echo-dapp 10 0x0073a8637d98649717bdc02ecb439c80aa8a10d0 0xdb99c9cdb2e2070a4e4e633c2e6874648dfe3971d14da843465b3d950df3dd19
 
@@ -75,8 +76,8 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
-		if len(args) > 1 && len(args) < 4 { //nolint: mnd
+	Cmd.PreRunE = func(_ *cobra.Command, args []string) error {
+		if len(args) > 1 && len(args) < 4 {
 			return fmt.Errorf(
 				"expected 1 argument (list) or 4 arguments (get), got %d", len(args))
 		}
@@ -101,7 +102,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 4 {
+	if len(args) >= 4 { //nolint:mnd // Four positional arguments select the get operation.
 		var params api.GetMatchParams
 		params.Application = args[0]
 		params.EpochIndex, err = config.AsHexString(args[1])
@@ -138,5 +139,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/outputs/outputs.go b/cmd/cartesi-rollups-cli/root/read/outputs/outputs.go
index d584689ea..08429211f 100644
--- a/cmd/cartesi-rollups-cli/root/read/outputs/outputs.go
+++ b/cmd/cartesi-rollups-cli/root/read/outputs/outputs.go
@@ -33,14 +33,15 @@ Supported Environment Variables:
   CARTESI_DATABASE_CONNECTION                    Database connection string`,
 }
 
+//nolint:lll // Long CLI examples are kept copy-pasteable.
 const examples = `# Read specific output:
 cartesi-rollups-cli read outputs echo-dapp 10
 
 # Read all outputs:
 cartesi-rollups-cli read outputs echo-dapp
 
-# Read all outputs with filter:
-cartesi-rollups-cli read outputs echo-dapp --epoch-index 10 --input-index 10 --output-type 0x237a816f --voucher-address 0x95eac57f9d67c5e0f255d5a19eb5d3fd00cafa73
+# Read all outputs with filters:
+cartesi-rollups-cli read outputs echo-dapp --epoch-index 10 --input-index 10 --output-type 0x237a816f --output-type 0x10321e8b --executed --voucher-address 0x95eac57f9d67c5e0f255d5a19eb5d3fd00cafa73
 
 # Read all outputs with pagination:
 cartesi-rollups-cli read outputs echo-dapp --limit 10 --offset 10 --descending
@@ -49,7 +50,8 @@ cartesi-rollups-cli read outputs echo-dapp --limit 10 --offset 10 --descending
 var (
 	epochIndex     string
 	inputIndex     string
-	outputType     string
+	outputTypes    []string
+	executed       bool
 	voucherAddress string
 	limit          uint64
 	offset         uint64
@@ -61,8 +63,10 @@ func init() {
 		"Filter outputs by epoch index (decimal or hex encoded)")
 	Cmd.Flags().StringVar(&inputIndex, "input-index", "",
 		"Filter outputs by input index (decimal or hex encoded)")
-	Cmd.Flags().StringVar(&outputType, "output-type", "",
-		"Filter outputs by output type (first 4 bytes of raw data hex encoded)")
+	Cmd.Flags().StringArrayVar(&outputTypes, "output-type", nil,
+		"Filter outputs by output type (first 4 bytes of raw data hex encoded); may be specified multiple times")
+	Cmd.Flags().BoolVar(&executed, "executed", false,
+		"Filter outputs by execution status")
 	Cmd.Flags().StringVar(&voucherAddress, "voucher-address", "",
 		"Filter outputs by voucher address (hex encoded)")
 	Cmd.Flags().Uint64Var(&limit, "limit", 50, //nolint: mnd
@@ -79,7 +83,7 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
+	Cmd.PreRunE = func(_ *cobra.Command, _ []string) error {
 		if limit > jsonrpc.LIST_ITEM_LIMIT {
 			return fmt.Errorf("limit cannot exceed %d", jsonrpc.LIST_ITEM_LIMIT)
 		}
@@ -101,7 +105,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 2 {
+	if len(args) >= 2 { //nolint:mnd // Two positional arguments select the get operation.
 		var params api.GetOutputParams
 		params.Application = args[0]
 		params.OutputIndex, err = config.AsHexString(args[1])
@@ -128,7 +132,13 @@ func run(cmd *cobra.Command, args []string) {
 
 		// Add output type filter if provided
 		if cmd.Flags().Changed("output-type") {
-			params.OutputType = &outputType
+			selectors := api.StringOrList(outputTypes)
+			params.OutputType = &selectors
+		}
+
+		// Add execution status filter if provided
+		if cmd.Flags().Changed("executed") {
+			params.Executed = &executed
 		}
 
 		// Add voucher address filter if provided
@@ -148,5 +158,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/read.go b/cmd/cartesi-rollups-cli/root/read/read.go
index 03568d9f2..b37d58420 100644
--- a/cmd/cartesi-rollups-cli/root/read/read.go
+++ b/cmd/cartesi-rollups-cli/root/read/read.go
@@ -22,7 +22,7 @@ import (
 var Cmd = &cobra.Command{
 	Use:   "read",
 	Short: "Read the node state from the database",
-	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+	PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
 		if !cmd.Flags().Changed("jsonrpc") && cmd.Flags().Changed("jsonrpc-api-url") {
 			if err := cmd.Flags().Set("jsonrpc", "true"); err != nil {
 				return err
diff --git a/cmd/cartesi-rollups-cli/root/read/reports/reports.go b/cmd/cartesi-rollups-cli/root/read/reports/reports.go
index 13e86f3bd..d6fea0350 100644
--- a/cmd/cartesi-rollups-cli/root/read/reports/reports.go
+++ b/cmd/cartesi-rollups-cli/root/read/reports/reports.go
@@ -73,7 +73,7 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
+	Cmd.PreRunE = func(_ *cobra.Command, _ []string) error {
 		if limit > jsonrpc.LIST_ITEM_LIMIT {
 			return fmt.Errorf("limit cannot exceed %d", jsonrpc.LIST_ITEM_LIMIT)
 		}
@@ -95,7 +95,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 2 {
+	if len(args) >= 2 { //nolint:mnd // Two positional arguments select the get operation.
 		var params api.GetReportParams
 		params.Application = args[0]
 		params.ReportIndex, err = config.AsHexString(args[1])
@@ -132,5 +132,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/service/jsonrpc.go b/cmd/cartesi-rollups-cli/root/read/service/jsonrpc.go
index b6bbb9efb..1a96b2099 100644
--- a/cmd/cartesi-rollups-cli/root/read/service/jsonrpc.go
+++ b/cmd/cartesi-rollups-cli/root/read/service/jsonrpc.go
@@ -46,11 +46,13 @@ func (s *JsonrpcReadService) ListEpochs(ctx context.Context, params api.ListEpoc
 	if _, err := config.ToApplicationNameOrAddressFromString(params.Application); err != nil {
 		return nil, fmt.Errorf("invalid application: %w", err)
 	}
-	// Add status filter if provided
+	// Validate status filter if provided
 	if params.Status != nil {
-		var statusVal model.EpochStatus
-		if err := statusVal.Scan(*params.Status); err != nil {
-			return nil, fmt.Errorf("invalid status: %w", err)
+		for i, status := range *params.Status {
+			var statusVal model.EpochStatus
+			if err := statusVal.Scan(status); err != nil {
+				return nil, fmt.Errorf("invalid status #%d: %w", i+1, err)
+			}
 		}
 	}
 
@@ -130,8 +132,10 @@ func (s *JsonrpcReadService) ListOutputs(ctx context.Context, params api.ListOut
 	}
 	// Add output type filter if provided
 	if params.OutputType != nil {
-		if _, err := api.ParseOutputType(*params.OutputType); err != nil {
-			return nil, fmt.Errorf("invalid output type: %w", err)
+		for i, selector := range *params.OutputType {
+			if _, err := api.ParseOutputType(selector); err != nil {
+				return nil, fmt.Errorf("invalid output type #%d: %w", i+1, err)
+			}
 		}
 	}
 	// Add voucher address filter if provided
@@ -338,7 +342,7 @@ func (s *JsonrpcReadService) ListMatches(ctx context.Context, params api.ListMat
 	return resp, err
 }
 
-func (s *JsonrpcReadService) GetMatchAdvanced(ctx context.Context, params api.GetMatchAdvancedParams) (json.RawMessage, error) {
+func (s *JsonrpcReadService) GetMatchAdvanced(ctx context.Context, params api.GetMatchAdvanceParams) (json.RawMessage, error) {
 	if _, err := config.ToApplicationNameOrAddressFromString(params.Application); err != nil {
 		return nil, fmt.Errorf("invalid application: %w", err)
 	}
@@ -356,7 +360,7 @@ func (s *JsonrpcReadService) GetMatchAdvanced(ctx context.Context, params api.Ge
 	}
 
 	var resp json.RawMessage
-	err := s.Client.Call(ctx, "cartesi_getMatchAdvanced", params, &resp)
+	err := s.Client.Call(ctx, "cartesi_getMatchAdvance", params, &resp)
 	return resp, err
 }
 
diff --git a/cmd/cartesi-rollups-cli/root/read/service/repository.go b/cmd/cartesi-rollups-cli/root/read/service/repository.go
index 89cb1399b..01a59fc70 100644
--- a/cmd/cartesi-rollups-cli/root/read/service/repository.go
+++ b/cmd/cartesi-rollups-cli/root/read/service/repository.go
@@ -87,11 +87,14 @@ func (s *RepositoryReadService) ListEpochs(ctx context.Context, params api.ListE
 	pagination := repository.Pagination{}
 	// Add status filter if provided
 	if params.Status != nil {
-		var statusVal model.EpochStatus
-		if err := statusVal.Scan(*params.Status); err != nil {
-			return nil, fmt.Errorf("invalid status: %w", err)
+		filter.Status = make([]model.EpochStatus, len(*params.Status))
+		for i, status := range *params.Status {
+			var statusVal model.EpochStatus
+			if err := statusVal.Scan(status); err != nil {
+				return nil, fmt.Errorf("invalid status #%d: %w", i+1, err)
+			}
+			filter.Status[i] = statusVal
 		}
-		filter.Status = []model.EpochStatus{statusVal}
 	}
 	pagination.Limit = params.Limit
 	pagination.Offset = params.Offset
@@ -289,9 +292,13 @@ func (s *RepositoryReadService) ListOutputs(ctx context.Context, params api.List
 	}
 	// Add output type filter if provided
 	if params.OutputType != nil {
-		outputTypeVal, err := api.ParseOutputType(*params.OutputType)
-		if err != nil {
-			return nil, fmt.Errorf("invalid output type: %w", err)
+		outputTypeVal := make([][]byte, len(*params.OutputType))
+		for i, selector := range *params.OutputType {
+			parsed, err := api.ParseOutputType(selector)
+			if err != nil {
+				return nil, fmt.Errorf("invalid output type #%d: %w", i+1, err)
+			}
+			outputTypeVal[i] = parsed
 		}
 		filter.OutputType = &outputTypeVal
 	}
@@ -303,6 +310,7 @@ func (s *RepositoryReadService) ListOutputs(ctx context.Context, params api.List
 		}
 		filter.VoucherAddress = &voucherAddressVal
 	}
+	filter.Executed = params.Executed
 	pagination.Limit = params.Limit
 	pagination.Offset = params.Offset
 
@@ -782,7 +790,7 @@ func (s *RepositoryReadService) ListMatches(ctx context.Context, params api.List
 	return json.RawMessage(result), err
 }
 
-func (s *RepositoryReadService) GetMatchAdvanced(ctx context.Context, params api.GetMatchAdvancedParams) (json.RawMessage, error) {
+func (s *RepositoryReadService) GetMatchAdvanced(ctx context.Context, params api.GetMatchAdvanceParams) (json.RawMessage, error) {
 	repo := s.Repository
 	application, err := config.ToApplicationNameOrAddressFromString(params.Application)
 	if err != nil {
@@ -839,7 +847,9 @@ func (s *RepositoryReadService) ListMatchAdvances(ctx context.Context, params ap
 	pagination.Limit = params.Limit
 	pagination.Offset = params.Offset
 
-	data, total, err := repo.ListMatchAdvances(ctx, application, epochIndex, params.TournamentAddress, params.IDHash, pagination, params.Descending)
+	data, total, err := repo.ListMatchAdvances(
+		ctx, application, epochIndex, params.TournamentAddress, params.IDHash, pagination, params.Descending,
+	)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cmd/cartesi-rollups-cli/root/read/service/types.go b/cmd/cartesi-rollups-cli/root/read/service/types.go
index fbdc8f3d4..4c647dbc7 100644
--- a/cmd/cartesi-rollups-cli/root/read/service/types.go
+++ b/cmd/cartesi-rollups-cli/root/read/service/types.go
@@ -35,7 +35,7 @@ type ReadService interface {
 	ListCommitments(ctx context.Context, params api.ListCommitmentsParams) (json.RawMessage, error)
 	GetMatch(ctx context.Context, params api.GetMatchParams) (json.RawMessage, error)
 	ListMatches(ctx context.Context, params api.ListMatchesParams) (json.RawMessage, error)
-	GetMatchAdvanced(ctx context.Context, params api.GetMatchAdvancedParams) (json.RawMessage, error)
+	GetMatchAdvanced(ctx context.Context, params api.GetMatchAdvanceParams) (json.RawMessage, error)
 	ListMatchAdvances(ctx context.Context, params api.ListMatchAdvancesParams) (json.RawMessage, error)
 	Close()
 }
@@ -47,11 +47,10 @@ func CreateReadService(ctx context.Context, useJsonrpc bool) (ReadService, error
 			return nil, err
 		}
 		return NewJsonrpcReadService(ctx, url)
-	} else {
-		dsn, err := config.GetDatabaseConnection()
-		if err != nil {
-			return nil, err
-		}
-		return NewRepositoryReadService(ctx, dsn.Raw())
 	}
+	dsn, err := config.GetDatabaseConnection()
+	if err != nil {
+		return nil, err
+	}
+	return NewRepositoryReadService(ctx, dsn.Raw())
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/tournaments/tournaments.go b/cmd/cartesi-rollups-cli/root/read/tournaments/tournaments.go
index e140298dc..e4d89ca84 100644
--- a/cmd/cartesi-rollups-cli/root/read/tournaments/tournaments.go
+++ b/cmd/cartesi-rollups-cli/root/read/tournaments/tournaments.go
@@ -33,6 +33,7 @@ Supported Environment Variables:
   CARTESI_DATABASE_CONNECTION                    Database connection string`,
 }
 
+//nolint:lll // Long CLI examples are kept copy-pasteable.
 const examples = `# Read specific tournament:
 cartesi-rollups-cli read tournaments echo-dapp 0x0073a8637d98649717bdc02ecb439c80aa8a10d0
 
@@ -79,7 +80,7 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
+	Cmd.PreRunE = func(_ *cobra.Command, _ []string) error {
 		if limit > jsonrpc.LIST_ITEM_LIMIT {
 			return fmt.Errorf("limit cannot exceed %d", jsonrpc.LIST_ITEM_LIMIT)
 		}
@@ -101,7 +102,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 2 {
+	if len(args) >= 2 { //nolint:mnd // Two positional arguments select the get operation.
 		var params api.GetTournamentParams
 		params.Application = args[0]
 		params.Address = args[1]
@@ -147,5 +148,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/read/withdrawals/withdrawals.go b/cmd/cartesi-rollups-cli/root/read/withdrawals/withdrawals.go
index e8481ba09..49f0b8549 100644
--- a/cmd/cartesi-rollups-cli/root/read/withdrawals/withdrawals.go
+++ b/cmd/cartesi-rollups-cli/root/read/withdrawals/withdrawals.go
@@ -71,7 +71,7 @@ func init() {
 		origHelpFunc(command, strings)
 	})
 
-	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
+	Cmd.PreRunE = func(_ *cobra.Command, _ []string) error {
 		if limit > jsonrpc.LIST_ITEM_LIMIT {
 			return fmt.Errorf("limit cannot exceed %d", jsonrpc.LIST_ITEM_LIMIT)
 		}
@@ -93,7 +93,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer readServ.Close()
 
 	var result json.RawMessage
-	if len(args) >= 2 {
+	if len(args) >= 2 { //nolint:mnd // Two positional arguments select the get operation.
 		var params api.GetWithdrawalParams
 		params.Application = args[0]
 		params.AccountIndex, err = config.AsHexString(args[1])
@@ -122,5 +122,6 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	out.WriteString("\n")
 
-	out.WriteTo(os.Stdout)
+	_, err = out.WriteTo(os.Stdout)
+	cobra.CheckErr(err)
 }
diff --git a/cmd/cartesi-rollups-cli/root/send/send.go b/cmd/cartesi-rollups-cli/root/send/send.go
index c96af0395..30308de40 100644
--- a/cmd/cartesi-rollups-cli/root/send/send.go
+++ b/cmd/cartesi-rollups-cli/root/send/send.go
@@ -125,7 +125,8 @@ func run(cmd *cobra.Command, args []string) {
 	cobra.CheckErr(err)
 	if app == nil {
 		fmt.Fprintf(os.Stderr, "application %q not found\n", nameOrAddress)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	// Check if stdin is being used for payload and --yes flag is not set
@@ -139,10 +140,10 @@ func run(cmd *cobra.Command, args []string) {
 	client, err := ethclient.DialContext(ctx, ethEndpoint.Raw())
 	cobra.CheckErr(err)
 
-	chainId, err := client.ChainID(ctx)
+	chainID, err := client.ChainID(ctx)
 	cobra.CheckErr(err)
 
-	txOpts, err := cli.GetTransactOpts(ctx, chainId)
+	txOpts, err := cli.GetTransactOpts(ctx, chainID)
 	cobra.CheckErr(err)
 
 	txOptsFactory := ethutil.NewStaticTransactOptsFactory(txOpts)
diff --git a/cmd/cartesi-rollups-cli/root/validate/validate.go b/cmd/cartesi-rollups-cli/root/validate/validate.go
index b7e161a66..9ae180b41 100644
--- a/cmd/cartesi-rollups-cli/root/validate/validate.go
+++ b/cmd/cartesi-rollups-cli/root/validate/validate.go
@@ -22,7 +22,7 @@ var Cmd = &cobra.Command{
 	Use:     "validate [app-name-or-address] [output-index]",
 	Short:   "Validates a notice",
 	Example: examples,
-	Args:    cobra.ExactArgs(2), // nolint: mnd
+	Args:    cobra.ExactArgs(2), //nolint:mnd
 	Run:     run,
 	Long: `
 Supported Environment Variables:
@@ -74,7 +74,8 @@ func run(cmd *cobra.Command, args []string) {
 
 	if output == nil {
 		fmt.Fprintf(os.Stderr, "The output with index %d was not found in the database\n", outputIndex)
-		os.Exit(1)
+		repo.Close()
+		os.Exit(1) //nolint:gocritic // The repository is closed explicitly before exiting.
 	}
 
 	app, err := repo.GetApplication(ctx, nameOrAddress)
@@ -82,6 +83,7 @@ func run(cmd *cobra.Command, args []string) {
 
 	if len(output.OutputHashesSiblings) == 0 {
 		fmt.Fprintf(os.Stderr, "The output with index %d has no associated proof yet\n", outputIndex)
+		repo.Close()
 		os.Exit(0)
 	}
 
diff --git a/cmd/cartesi-rollups-cli/root/withdraw/withdraw.go b/cmd/cartesi-rollups-cli/root/withdraw/withdraw.go
index 4ce1b6085..66a968c41 100644
--- a/cmd/cartesi-rollups-cli/root/withdraw/withdraw.go
+++ b/cmd/cartesi-rollups-cli/root/withdraw/withdraw.go
@@ -180,7 +180,7 @@ func run(cmd *cobra.Command, args []string) {
 
 func loadProof(path string) ([]byte, iapplication.AccountValidityProof, error) {
 	zero := iapplication.AccountValidityProof{}
-	raw, err := os.ReadFile(path) //nolint:gosec
+	raw, err := os.ReadFile(path)
 	if err != nil {
 		return nil, zero, fmt.Errorf("read proof file %s: %w", path, err)
 	}
diff --git a/cmd/cartesi-rollups-cli/util/util.go b/cmd/cartesi-rollups-cli/util/util.go
index e00f700b9..c878987b3 100644
--- a/cmd/cartesi-rollups-cli/util/util.go
+++ b/cmd/cartesi-rollups-cli/util/util.go
@@ -69,7 +69,7 @@ func ReadRootHash(machineDir string) (common.Hash, error) {
 
 	// root hash is located at this offset (0x60). Double check its value
 	// with the cartesi-machine-stored-hash tool.
-	_, err = f.Seek(0x60, io.SeekStart)
+	_, err = f.Seek(0x60, io.SeekStart) //nolint:mnd // Fixed root-hash offset in the machine image header.
 	if err != nil {
 		return zero, err
 	}
diff --git a/cmd/cartesi-rollups-cli/util/util_test.go b/cmd/cartesi-rollups-cli/util/util_test.go
index bcd71a249..74d3ed9fa 100644
--- a/cmd/cartesi-rollups-cli/util/util_test.go
+++ b/cmd/cartesi-rollups-cli/util/util_test.go
@@ -1,7 +1,7 @@
 // (c) Cartesi and individual authors (see AUTHORS)
 // SPDX-License-Identifier: Apache-2.0 (see LICENSE)
 
-package util
+package util //nolint:revive // Tests intentionally exercise unexported package helpers.
 
 import (
 	"context"
diff --git a/docs/http-posture.md b/docs/http-posture.md
index ae9e601f5..d38ee3011 100644
--- a/docs/http-posture.md
+++ b/docs/http-posture.md
@@ -14,7 +14,7 @@ operator-side network policy.
 | Surface | Default address | Purpose | Per-request cost |
 | --- | --- | --- | --- |
 | **Telemetry** (`/livez`, `/readyz`) | `:10000` | Orchestrator health checks | Trivial — a boolean check and a short response |
-| **JSON-RPC API** (`/rpc`) | `:10011` | Read-only query interface | Up to 1 MiB body, DB queries, list responses up to 10000 items |
+| **JSON-RPC API** (`/rpc`) | `:10011` | Read-only query interface | Up to 1 MiB body; one list operation, or a batch with a cumulative list limit of 10000 items; DB queries |
 | **Inspect** (`/inspect/{dapp}`) | `:10012` | Machine state query without advancing | Up to 2 MiB body, Cartesi Machine fork + execution |
 
 Telemetry is cheap by design — orchestrators (Kubernetes, Docker,
@@ -149,6 +149,32 @@ falls back to:
   fail-fast; deeper in the request path).
 - JSON-RPC: the PostgreSQL connection pool (blocking).
 
+### JSON-RPC batch work budget
+
+Admission counts HTTP requests, while a JSON-RPC batch can contain up to 100
+operations. To keep one admitted batch from buying substantially more row-fetch
+work than one maximal list request, the service applies a protocol-level budget
+before dispatch:
+
+- The sum of the effective `limit` values across all list entries in a batch
+  must not exceed 10000.
+- An omitted or zero `limit` counts as the default of 50. A value above the
+  per-list maximum is capped to 10000 before it is added.
+- If the sum exceeds 10000, the whole batch is rejected before any handler or
+  database query runs. The response is one JSON-RPC error object with code
+  `-31004` and message `Batch list item limit exceeded`.
+- Non-list entries do not consume this work budget. A single request retains
+  the existing per-list maximum of 10000.
+
+This restores the row-fetch bound that existed before batch support: one
+admission slot can fetch at most as many rows as one maximal list call. It does
+not bound `COUNT(*)` cost, which is independent of `limit`. It also does not
+meter `offset` traversal cost; that cost is bounded by the size of the filtered
+set rather than by the numeric `offset` value, but PostgreSQL may still have to
+scan and discard the matching rows before the requested page. Selective
+filters, the pending-output partial index, proxy rate limiting, and PostgreSQL
+capacity planning remain important.
+
 ### Rejection semantics
 
 When admission rejects a request:
@@ -217,13 +243,21 @@ pipeline additional requests on the same connection. This behavior
 depends on the internal `responseWriterTap.Unwrap()` cooperating with
 `http.MaxBytesReader`; see the hardening v3 plan for the design note.
 
-**Worst-case body buffer memory under saturation.**
+**Worst-case request and response memory under saturation.**
 Each admitted request pins its body buffer for the full request lifetime
-(up to `InspectMaxDeadline + 30s` for inspect (typically ~210s with the default 180s deadline), 30s for JSON-RPC). At default concurrency this
-means `CARTESI_INSPECT_MAX_INFLIGHT × 2 MiB = 128 MiB` for inspect and
-`CARTESI_JSONRPC_MAX_INFLIGHT × 1 MiB = 64 MiB` for JSON-RPC. Operators
-should size process RAM headroom accordingly, on top of machine state,
-database connections, and other working memory.
+(up to `InspectMaxDeadline + 30s` for inspect (typically ~210s with the default
+180s deadline), 30s for JSON-RPC). At default concurrency this means
+`CARTESI_INSPECT_MAX_INFLIGHT × 2 MiB = 128 MiB` for inspect and
+`CARTESI_JSONRPC_MAX_INFLIGHT × 1 MiB = 64 MiB` for JSON-RPC request bodies.
+
+The dominant JSON-RPC term is response buffering: each of the 64 admitted
+requests has a 10 MiB response budget, for up to `64 × 10 MiB = 640 MiB` of
+response buffers under saturation, or approximately 704 MiB including request
+bodies. The budget is enforced while encoding the response, after repository
+rows and decoded response objects have already been materialized; that working
+set is additional and is not bounded by the 10 MiB serialized-response limit.
+Operators should size process RAM headroom accordingly, on top of machine
+state, database connections, and other working memory.
 
 ## PostgreSQL pool sizing
 
diff --git a/internal/jsonrpc/api/decode.go b/internal/jsonrpc/api/decode.go
index 3e74266c9..7160ce28c 100644
--- a/internal/jsonrpc/api/decode.go
+++ b/internal/jsonrpc/api/decode.go
@@ -33,7 +33,7 @@ func ParseOutputType(s string) ([]byte, error) {
 
 // EvmAdvance represents decoded EvmAdvance input data.
 type EvmAdvance struct {
-	ChainId        string `json:"chain_id"`
+	ChainID        string `json:"chain_id"`
 	AppContract    string `json:"application_contract"`
 	MsgSender      string `json:"sender"`
 	BlockNumber    string `json:"block_number"`
@@ -52,7 +52,7 @@ type DecodedInput struct {
 // DecodeInput ABI-decodes a raw input into a DecodedInput.
 func DecodeInput(input *model.Input, parsedAbi *abi.ABI) (*DecodedInput, error) {
 	decoded := make(map[string]any)
-	if len(input.RawData) < 4 {
+	if len(input.RawData) < 4 { //nolint: mnd
 		return &DecodedInput{Input: input}, fmt.Errorf("error: input needs at least 4 bytes")
 	}
 
@@ -71,7 +71,7 @@ func DecodeInput(input *model.Input, parsedAbi *abi.ABI) (*DecodedInput, error)
 		return &DecodedInput{Input: input}, err
 	}
 
-	chainId, ok1 := decoded["chainId"].(*big.Int)
+	chainID, ok1 := decoded["chainId"].(*big.Int)
 	appContract, ok2 := decoded["appContract"].(common.Address)
 	msgSender, ok3 := decoded["msgSender"].(common.Address)
 	blockNumber, ok4 := decoded["blockNumber"].(*big.Int)
@@ -84,7 +84,7 @@ func DecodeInput(input *model.Input, parsedAbi *abi.ABI) (*DecodedInput, error)
 	}
 
 	evmAdvance := EvmAdvance{
-		ChainId:        fmt.Sprintf("0x%x", chainId),
+		ChainID:        fmt.Sprintf("0x%x", chainID),
 		AppContract:    appContract.Hex(),
 		MsgSender:      msgSender.Hex(),
 		BlockNumber:    fmt.Sprintf("0x%x", blockNumber),
@@ -171,7 +171,7 @@ type DecodedOutput struct {
 // DecodeOutput ABI-decodes a raw output into a DecodedOutput.
 func DecodeOutput(output *model.Output, parsedAbi *abi.ABI) (*DecodedOutput, error) {
 	decodedOutput := &DecodedOutput{Output: output}
-	if len(output.RawData) < 4 {
+	if len(output.RawData) < 4 { //nolint: mnd
 		return decodedOutput, fmt.Errorf("raw data too short")
 	}
 	method, err := parsedAbi.MethodById(output.RawData[:4])
diff --git a/internal/jsonrpc/api/params.go b/internal/jsonrpc/api/params.go
index ef21488c2..9736a06ba 100644
--- a/internal/jsonrpc/api/params.go
+++ b/internal/jsonrpc/api/params.go
@@ -3,6 +3,34 @@
 
 package api
 
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"reflect"
+)
+
+type StringOrList []string
+
+func (s *StringOrList) UnmarshalJSON(data []byte) error {
+	data = bytes.TrimSpace(data)
+	if len(data) > 0 && data[0] == '"' {
+		var value string
+		if err := json.Unmarshal(data, &value); err != nil {
+			return err
+		}
+		*s = []string{value}
+		return nil
+	}
+
+	var values []string
+	if err := json.Unmarshal(data, &values); err != nil {
+		return fmt.Errorf("expected a string or an array of strings: %w", err)
+	}
+	*s = values
+	return nil
+}
+
 // ListApplicationsParams aligns with the OpenRPC specification
 type ListApplicationsParams struct {
 	Limit      uint64 `json:"limit"`
@@ -17,11 +45,13 @@ type GetApplicationParams struct {
 
 // ListEpochsParams aligns with the OpenRPC specification
 type ListEpochsParams struct {
-	Application string  `json:"application"`
-	Status      *string `json:"status,omitempty"`
-	Limit       uint64  `json:"limit"`
-	Offset      uint64  `json:"offset"`
-	Descending  bool    `json:"descending,omitempty"`
+	Application string        `json:"application"`
+	Status      *StringOrList `json:"status,omitempty"`
+	Limit       uint64        `json:"limit"`
+	Offset      uint64        `json:"offset"`
+	Descending  bool          `json:"descending,omitempty"`
+	From        *string       `json:"from,omitempty"` // inclusive lower bound on the epoch index (hex)
+	To          *string       `json:"to,omitempty"`   // inclusive upper bound on the epoch index (hex)
 }
 
 // GetEpochParams aligns with the OpenRPC specification
@@ -30,6 +60,12 @@ type GetEpochParams struct {
 	EpochIndex  string `json:"epoch_index"`
 }
 
+// GetEpochByVirtualIndexParams aligns with the OpenRPC specification
+type GetEpochByVirtualIndexParams struct {
+	Application  string `json:"application"`
+	VirtualIndex string `json:"virtual_index"`
+}
+
 // GetLastAcceptedEpochIndexParams with the OpenRPC specification
 type GetLastAcceptedEpochIndexParams struct {
 	Application string `json:"application"`
@@ -44,6 +80,8 @@ type ListInputsParams struct {
 	Limit           uint64  `json:"limit"`
 	Offset          uint64  `json:"offset"`
 	Descending      bool    `json:"descending,omitempty"`
+	From            *string `json:"from,omitempty"` // inclusive lower bound on the input index (hex)
+	To              *string `json:"to,omitempty"`   // inclusive upper bound on the input index (hex)
 }
 
 // GetInputParams aligns with the OpenRPC specification
@@ -59,14 +97,17 @@ type GetProcessedInputCountParams struct {
 
 // ListOutputsParams aligns with the OpenRPC specification
 type ListOutputsParams struct {
-	Application    string  `json:"application"`
-	EpochIndex     *string `json:"epoch_index,omitempty"`
-	InputIndex     *string `json:"input_index,omitempty"`
-	OutputType     *string `json:"output_type,omitempty"`
-	VoucherAddress *string `json:"voucher_address,omitempty"`
-	Limit          uint64  `json:"limit"`
-	Offset         uint64  `json:"offset"`
-	Descending     bool    `json:"descending,omitempty"`
+	Application    string        `json:"application"`
+	EpochIndex     *string       `json:"epoch_index,omitempty"`
+	InputIndex     *string       `json:"input_index,omitempty"`
+	OutputType     *StringOrList `json:"output_type,omitempty"`
+	VoucherAddress *string       `json:"voucher_address,omitempty"`
+	Limit          uint64        `json:"limit"`
+	Offset         uint64        `json:"offset"`
+	Descending     bool          `json:"descending,omitempty"`
+	From           *string       `json:"from,omitempty"` // inclusive lower bound on the output index (hex)
+	To             *string       `json:"to,omitempty"`   // inclusive upper bound on the output index (hex)
+	Executed       *bool         `json:"executed,omitempty"`
 }
 
 // GetOutputParams aligns with the OpenRPC specification
@@ -83,6 +124,8 @@ type ListReportsParams struct {
 	Limit       uint64  `json:"limit"`
 	Offset      uint64  `json:"offset"`
 	Descending  bool    `json:"descending,omitempty"`
+	From        *string `json:"from,omitempty"` // inclusive lower bound on the report index (hex)
+	To          *string `json:"to,omitempty"`   // inclusive upper bound on the report index (hex)
 }
 
 // GetReportParams aligns with the OpenRPC specification
@@ -156,8 +199,8 @@ type ListMatchAdvancesParams struct {
 	Descending        bool   `json:"descending,omitempty"`
 }
 
-// GetMatchAdvancedParams aligns with the OpenRPC specification
-type GetMatchAdvancedParams struct {
+// GetMatchAdvanceParams aligns with the OpenRPC specification
+type GetMatchAdvanceParams struct {
 	Application       string `json:"application"`
 	EpochIndex        string `json:"epoch_index"`
 	TournamentAddress string `json:"tournament_address"`
@@ -179,3 +222,61 @@ type GetWithdrawalParams struct {
 	Application  string `json:"application"`
 	AccountIndex string `json:"account_index"`
 }
+
+// UnmarshalParams supports both by-name (object) and by-position (array) parameter structures.
+// If params is an object, it simply does json.Unmarshal; if it's an array, it will attempt
+// to unmarshal each positional parameter into the target struct field in declaration order.
+func UnmarshalParams(data json.RawMessage, target any) error {
+	data = bytes.TrimSpace(data)
+	switch {
+	case len(data) == 0:
+		// Parameters field is absent
+		return nil
+	case data[0] == '[':
+		// Unmarshal positional parameters into a slice of json.RawMessage.
+		var rawParams []json.RawMessage
+		if err := json.Unmarshal(data, &rawParams); err != nil {
+			return err
+		}
+		// Use reflection to set values in the target struct in the order they appear.
+		val := reflect.ValueOf(target)
+		if val.Kind() != reflect.Pointer || val.IsNil() {
+			return fmt.Errorf("error unmarshalling positional parameters target must be a non-nil pointer to a struct")
+		}
+		val = val.Elem()
+		if val.Kind() != reflect.Struct {
+			return fmt.Errorf("error unmarshalling positional parameters target must point to a struct")
+		}
+		typ := val.Type()
+		fields := make([]int, 0, typ.NumField())
+		for i := 0; i < typ.NumField(); i++ {
+			if typ.Field(i).Tag.Get("json") != "-" {
+				fields = append(fields, i)
+			}
+		}
+		if len(rawParams) > len(fields) {
+			return fmt.Errorf("error unmarshalling positional parameters, expected %d params, got %d",
+				len(fields), len(rawParams))
+		}
+		// Map positional parameters to JSON-visible fields in declaration order.
+		for i, fieldIndex := range fields {
+			if i >= len(rawParams) {
+				break
+			}
+			field := val.Field(fieldIndex)
+			if !field.CanSet() {
+				return fmt.Errorf("error unmarshalling positional parameter field %q is not settable",
+					typ.Field(fieldIndex).Name)
+			}
+			// Unmarshal the corresponding raw parameter into the field.
+			if err := json.Unmarshal(rawParams[i], field.Addr().Interface()); err != nil {
+				return fmt.Errorf("error unmarshalling positional parameter %d for field %s: %w",
+					i, typ.Field(fieldIndex).Name, err)
+			}
+		}
+		return nil
+	default:
+		// Otherwise, assume by-name structure.
+		return json.Unmarshal(data, target)
+	}
+}
diff --git a/internal/jsonrpc/api/params_test.go b/internal/jsonrpc/api/params_test.go
new file mode 100644
index 000000000..5836a5ca5
--- /dev/null
+++ b/internal/jsonrpc/api/params_test.go
@@ -0,0 +1,269 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package api
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestListOutputsParamsStringOrList(t *testing.T) {
+	tests := map[string]struct {
+		input    string
+		expected StringOrList
+	}{
+		"single selector": {
+			input:    `{"output_type":"0x237a816f"}`,
+			expected: StringOrList{"0x237a816f"},
+		},
+		"selector list": {
+			input:    `{"output_type":["0x237a816f","0x10321e8b"]}`,
+			expected: StringOrList{"0x237a816f", "0x10321e8b"},
+		},
+		"empty list": {
+			input:    `{"output_type":[]}`,
+			expected: StringOrList{},
+		},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			var params ListOutputsParams
+			require.NoError(t, json.Unmarshal([]byte(test.input), &params))
+			require.NotNil(t, params.OutputType)
+			require.Equal(t, test.expected, *params.OutputType)
+		})
+	}
+}
+
+func TestListEpochsParamsStringOrList(t *testing.T) {
+	tests := map[string]struct {
+		input    string
+		expected StringOrList
+	}{
+		"single status": {
+			input:    `{"status":"OPEN"}`,
+			expected: StringOrList{"OPEN"},
+		},
+		"status list": {
+			input:    `{"status":["OPEN","CLOSED"]}`,
+			expected: StringOrList{"OPEN", "CLOSED"},
+		},
+		"empty list": {
+			input:    `{"status":[]}`,
+			expected: StringOrList{},
+		},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			var params ListEpochsParams
+			require.NoError(t, json.Unmarshal([]byte(test.input), &params))
+			require.NotNil(t, params.Status)
+			require.Equal(t, test.expected, *params.Status)
+		})
+	}
+}
+
+func TestListOutputsParamsExecutedIsOptional(t *testing.T) {
+	var omitted ListOutputsParams
+	require.NoError(t, json.Unmarshal([]byte(`{}`), &omitted))
+	require.Nil(t, omitted.Executed)
+
+	var executed ListOutputsParams
+	require.NoError(t, json.Unmarshal([]byte(`{"executed":true}`), &executed))
+	require.NotNil(t, executed.Executed)
+	require.True(t, *executed.Executed)
+
+	var pending ListOutputsParams
+	require.NoError(t, json.Unmarshal([]byte(`{"executed":false}`), &pending))
+	require.NotNil(t, pending.Executed)
+	require.False(t, *pending.Executed)
+}
+
+func TestPositionalParamsDeclarationOrder(t *testing.T) {
+	tests := map[string]struct {
+		newTarget  func() any
+		positional string
+		named      string
+	}{
+		"ListApplicationsParams": {
+			func() any { return &ListApplicationsParams{} },
+			`[25,3,true]`,
+			`{"limit":25,"offset":3,"descending":true}`,
+		},
+		"GetApplicationParams": {
+			func() any { return &GetApplicationParams{} },
+			`["app"]`,
+			`{"application":"app"}`,
+		},
+		"ListEpochsParams": {
+			func() any { return &ListEpochsParams{} },
+			`["app",["OPEN","CLOSED"],25,3,true,"0x2","0x9"]`,
+			`{"application":"app","status":["OPEN","CLOSED"],"limit":25,"offset":3,"descending":true,"from":"0x2","to":"0x9"}`,
+		},
+		"GetEpochParams": {
+			func() any { return &GetEpochParams{} },
+			`["app","0x4"]`,
+			`{"application":"app","epoch_index":"0x4"}`,
+		},
+		"GetEpochByVirtualIndexParams": {
+			func() any { return &GetEpochByVirtualIndexParams{} },
+			`["app","0x7"]`,
+			`{"application":"app","virtual_index":"0x7"}`,
+		},
+		"GetLastAcceptedEpochIndexParams": {
+			func() any { return &GetLastAcceptedEpochIndexParams{} },
+			`["app"]`,
+			`{"application":"app"}`,
+		},
+		"ListInputsParams": {
+			func() any { return &ListInputsParams{} },
+			`["app","0x4","sender","transaction-hash",25,3,true,"0x2","0x9"]`,
+			`{"application":"app","epoch_index":"0x4","sender":"sender","transaction_hash":"transaction-hash",` +
+				`"limit":25,"offset":3,"descending":true,"from":"0x2","to":"0x9"}`,
+		},
+		"GetInputParams": {
+			func() any { return &GetInputParams{} },
+			`["app","0x5"]`,
+			`{"application":"app","input_index":"0x5"}`,
+		},
+		"GetProcessedInputCountParams": {
+			func() any { return &GetProcessedInputCountParams{} },
+			`["app"]`,
+			`{"application":"app"}`,
+		},
+		"ListOutputsParams": {
+			func() any { return &ListOutputsParams{} },
+			`["app","0x4","0x5",["0x237a816f","0x10321e8b"],"voucher",25,3,true,"0x2","0x9",true]`,
+			`{"application":"app","epoch_index":"0x4","input_index":"0x5",` +
+				`"output_type":["0x237a816f","0x10321e8b"],"voucher_address":"voucher",` +
+				`"limit":25,"offset":3,"descending":true,"from":"0x2","to":"0x9","executed":true}`,
+		},
+		"GetOutputParams": {
+			func() any { return &GetOutputParams{} },
+			`["app","0x6"]`,
+			`{"application":"app","output_index":"0x6"}`,
+		},
+		"ListReportsParams": {
+			func() any { return &ListReportsParams{} },
+			`["app","0x4","0x5",25,3,true,"0x2","0x9"]`,
+			`{"application":"app","epoch_index":"0x4","input_index":"0x5","limit":25,"offset":3,"descending":true,"from":"0x2","to":"0x9"}`,
+		},
+		"GetReportParams": {
+			func() any { return &GetReportParams{} },
+			`["app","0x7"]`,
+			`{"application":"app","report_index":"0x7"}`,
+		},
+		"ListTournamentsParams": {
+			func() any { return &ListTournamentsParams{} },
+			`["app","0x4","0x2","parent-tournament","parent-match",25,3,true]`,
+			`{"application":"app","epoch_index":"0x4","level":"0x2",` +
+				`"parent_tournament_address":"parent-tournament","parent_match_id_hash":"parent-match",` +
+				`"limit":25,"offset":3,"descending":true}`,
+		},
+		"GetTournamentParams": {
+			func() any { return &GetTournamentParams{} },
+			`["app","tournament"]`,
+			`{"application":"app","address":"tournament"}`,
+		},
+		"ListCommitmentsParams": {
+			func() any { return &ListCommitmentsParams{} },
+			`["app","0x4","tournament",25,3,true]`,
+			`{"application":"app","epoch_index":"0x4","tournament_address":"tournament","limit":25,"offset":3,"descending":true}`,
+		},
+		"GetCommitmentParams": {
+			func() any { return &GetCommitmentParams{} },
+			`["app","0x4","tournament","commitment"]`,
+			`{"application":"app","epoch_index":"0x4","tournament_address":"tournament","commitment":"commitment"}`,
+		},
+		"ListMatchesParams": {
+			func() any { return &ListMatchesParams{} },
+			`["app","0x4","tournament",25,3,true]`,
+			`{"application":"app","epoch_index":"0x4","tournament_address":"tournament","limit":25,"offset":3,"descending":true}`,
+		},
+		"GetMatchParams": {
+			func() any { return &GetMatchParams{} },
+			`["app","0x4","tournament","id-hash"]`,
+			`{"application":"app","epoch_index":"0x4","tournament_address":"tournament","id_hash":"id-hash"}`,
+		},
+		"ListMatchAdvancesParams": {
+			func() any { return &ListMatchAdvancesParams{} },
+			`["app","0x4","tournament","id-hash",25,3,true]`,
+			`{"application":"app","epoch_index":"0x4","tournament_address":"tournament",` +
+				`"id_hash":"id-hash","limit":25,"offset":3,"descending":true}`,
+		},
+		"GetMatchAdvanceParams": {
+			func() any { return &GetMatchAdvanceParams{} },
+			`["app","0x4","tournament","id-hash","parent"]`,
+			`{"application":"app","epoch_index":"0x4","tournament_address":"tournament","id_hash":"id-hash","parent":"parent"}`,
+		},
+		"ListWithdrawalsParams": {
+			func() any { return &ListWithdrawalsParams{} },
+			`["app","0x8",25,3,true]`,
+			`{"application":"app","account_index":"0x8","limit":25,"offset":3,"descending":true}`,
+		},
+		"GetWithdrawalParams": {
+			func() any { return &GetWithdrawalParams{} },
+			`["app","0x8"]`,
+			`{"application":"app","account_index":"0x8"}`,
+		},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			expected := test.newTarget()
+			require.NoError(t, json.Unmarshal([]byte(test.named), expected))
+
+			actual := test.newTarget()
+			require.NoError(t, UnmarshalParams(json.RawMessage(test.positional), actual))
+
+			require.Equal(t, expected, actual)
+		})
+	}
+}
+
+func TestUnmarshalParamsEmptyRepresentationsLeaveTargetUnchanged(t *testing.T) {
+	for name, data := range map[string]json.RawMessage{
+		"omitted":     nil,
+		"null":        json.RawMessage(`null`),
+		"empty array": json.RawMessage(`[]`),
+	} {
+		t.Run(name, func(t *testing.T) {
+			params := ListApplicationsParams{Limit: 7, Offset: 3, Descending: true}
+			expected := params
+
+			require.NoError(t, UnmarshalParams(data, &params))
+			require.Equal(t, expected, params)
+		})
+	}
+}
+
+func TestUnmarshalParamsRejectsPositionalOverArity(t *testing.T) {
+	var params GetApplicationParams
+	err := UnmarshalParams(json.RawMessage(`["app","extra"]`), &params)
+
+	require.EqualError(t, err, "error unmarshalling positional parameters, expected 1 params, got 2")
+}
+
+func TestUnmarshalParamsPositionalOrderSkipsIgnoredJSONFields(t *testing.T) {
+	type paramsWithIgnoredField struct {
+		First   string `json:"first"`
+		Ignored string `json:"-"`
+		Second  string `json:"second"`
+	}
+
+	params := paramsWithIgnoredField{Ignored: "unchanged"}
+	require.NoError(t, UnmarshalParams(json.RawMessage(`["one","two"]`), &params))
+	require.Equal(t, paramsWithIgnoredField{
+		First:   "one",
+		Ignored: "unchanged",
+		Second:  "two",
+	}, params)
+
+	err := UnmarshalParams(json.RawMessage(`["one","two","extra"]`), &params)
+	require.EqualError(t, err, "error unmarshalling positional parameters, expected 2 params, got 3")
+}
diff --git a/internal/jsonrpc/api/response.go b/internal/jsonrpc/api/response.go
index 8f974a8ad..69caa614c 100644
--- a/internal/jsonrpc/api/response.go
+++ b/internal/jsonrpc/api/response.go
@@ -20,3 +20,9 @@ type ListResponse[T any] struct {
 type SingleResponse[T any] struct {
 	Data T `json:"data"`
 }
+
+type NodeInfo struct {
+	ChainID      string `json:"chain_id"`
+	Version      string `json:"version"`
+	DefaultBlock string `json:"default_block"` // FINALIZED | SAFE | LATEST | PENDING
+}
diff --git a/internal/jsonrpc/batchbudget_test.go b/internal/jsonrpc/batchbudget_test.go
new file mode 100644
index 000000000..84c844b79
--- /dev/null
+++ b/internal/jsonrpc/batchbudget_test.go
@@ -0,0 +1,139 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package jsonrpc
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"sync/atomic"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestMethodErrorListsExcludeBatchWideErrors(t *testing.T) {
+	data, err := discoverSpec.ReadFile("jsonrpc-discover.json")
+	require.NoError(t, err)
+	var spec struct {
+		Methods []struct {
+			Name   string `json:"name"`
+			Errors []struct {
+				Ref string `json:"$ref"`
+			} `json:"errors"`
+		} `json:"methods"`
+	}
+	require.NoError(t, json.Unmarshal(data, &spec))
+
+	for _, method := range spec.Methods {
+		refs := make(map[string]bool, len(method.Errors))
+		for _, methodErr := range method.Errors {
+			name := methodErr.Ref[strings.LastIndex(methodErr.Ref, "/")+1:]
+			refs[name] = true
+		}
+		require.False(t, refs["BatchListItemLimitExceeded"],
+			"%s must not advertise a whole-batch error as a per-method error", method.Name)
+		require.True(t, refs["TimeoutError"], "%s must advertise timeout responses", method.Name)
+		require.True(t, refs["ResponseSizeLimitExceeded"],
+			"%s must advertise response-size errors", method.Name)
+	}
+}
+
+func TestBatchListItemLimitSupportsNamedAndPositionalParams(t *testing.T) {
+	positionalAtLimit := map[string]string{
+		"cartesi_listApplications":  `[10000]`,
+		"cartesi_listEpochs":        `["app",null,10000]`,
+		"cartesi_listInputs":        `["app",null,null,null,10000]`,
+		"cartesi_listOutputs":       `["app",null,null,null,null,10000]`,
+		"cartesi_listReports":       `["app",null,null,10000]`,
+		"cartesi_listWithdrawals":   `["app",null,10000]`,
+		"cartesi_listTournaments":   `["app",null,null,null,null,10000]`,
+		"cartesi_listCommitments":   `["app",null,null,10000]`,
+		"cartesi_listMatches":       `["app",null,null,10000]`,
+		"cartesi_listMatchAdvances": `["app","0x0","tournament","id",10000]`,
+	}
+
+	for method, positional := range positionalAtLimit {
+		t.Run(method, func(t *testing.T) {
+			requests := []json.RawMessage{
+				json.RawMessage(fmt.Sprintf(
+					`{"jsonrpc":"2.0","method":%q,"params":%s,"id":1}`, method, positional)),
+				json.RawMessage(
+					`{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":1},"id":2}`),
+			}
+			require.True(t, batchExceedsListItemLimit(requests))
+		})
+	}
+
+	require.False(t, batchExceedsListItemLimit([]json.RawMessage{
+		json.RawMessage(
+			`{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":6000},"id":1}`),
+		json.RawMessage(
+			`{"jsonrpc":"2.0","method":"cartesi_listOutputs","params":{"limit":4000},"id":2}`),
+	}))
+}
+
+func TestBatchListItemLimitRegistryCoversEveryListHandler(t *testing.T) {
+	for method := range jsonrpcHandlers {
+		if strings.HasPrefix(method, "cartesi_list") {
+			require.Contains(t, listParamsTypes, method)
+		}
+	}
+}
+
+func TestBatchListItemLimitNormalizesLimitsLikeHandlers(t *testing.T) {
+	// A zero limit uses the default, while a value above the per-list maximum
+	// is capped at that maximum.
+	require.False(t, batchExceedsListItemLimit([]json.RawMessage{json.RawMessage(
+		`{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":0},"id":1}`,
+	)}))
+	require.False(t, batchExceedsListItemLimit([]json.RawMessage{json.RawMessage(
+		`{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":20000},"id":1}`,
+	)}))
+	require.True(t, batchExceedsListItemLimit([]json.RawMessage{
+		json.RawMessage(
+			`{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":20000},"id":1}`),
+		json.RawMessage(
+			`{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":1},"id":2}`),
+	}))
+}
+
+func TestJSONRPCBatchRejectsListWorkOverLimitBeforeDispatch(t *testing.T) {
+	s := newBatchTestService()
+	var calls atomic.Int32
+	withTestRPCHandler(t, s, "cartesi_listApplications", func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		calls.Add(1)
+		return true, nil
+	})
+
+	rr := serveRPC(t, s, []byte(`[
+		{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":6000},"id":1},
+		{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":4001},"id":2}
+	]`))
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	response := decodeRPCResponse(t, rr.Body.Bytes())
+	requireRPCError(t, response, nil, JSONRPC_BATCH_LIST_ITEM_LIMIT_EXCEEDED)
+	require.Equal(t, "Batch list item limit exceeded", response.Error.Message)
+	require.Zero(t, calls.Load(), "an over-budget batch must be rejected before dispatch")
+}
+
+func TestJSONRPCBatchAllowsListWorkAtLimit(t *testing.T) {
+	s := newBatchTestService()
+	var calls atomic.Int32
+	withTestRPCHandler(t, s, "cartesi_listApplications", func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		calls.Add(1)
+		return true, nil
+	})
+
+	rr := serveRPC(t, s, []byte(`[
+		{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":6000},"id":1},
+		{"jsonrpc":"2.0","method":"cartesi_listApplications","params":{"limit":4000},"id":2}
+	]`))
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	require.Len(t, decodeRPCBatch(t, rr.Body.Bytes()), 2)
+	require.Equal(t, int32(2), calls.Load())
+}
diff --git a/internal/jsonrpc/batchcalls_test.go b/internal/jsonrpc/batchcalls_test.go
new file mode 100644
index 000000000..538b7ee62
--- /dev/null
+++ b/internal/jsonrpc/batchcalls_test.go
@@ -0,0 +1,695 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package jsonrpc
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"github.com/cartesi/rollups-node/pkg/service"
+	"github.com/stretchr/testify/require"
+)
+
+const (
+	testBatchSize           = 100
+	testBatchSuccessCount   = 10
+	testLargeResultSize     = 1<<20 - 38 // 1 MB - `,{"jsonrpc":"2.0","result":"...","id":??}`
+	testResponseBudgetSlack = 1 << 20
+)
+
+func serveRPC(t *testing.T, s *Service, body []byte) *httptest.ResponseRecorder {
+	t.Helper()
+	req := httptest.NewRequest(http.MethodPost, "/rpc", bytes.NewReader(body))
+	req.Header.Set("Content-Type", "application/json")
+	rr := httptest.NewRecorder()
+	s.handleRPC(rr, req)
+	return rr
+}
+
+func newBatchTestService() *Service {
+	return &Service{
+		Service: service.Service{
+			Logger: slog.New(slog.NewTextHandler(&bytes.Buffer{}, nil)),
+		},
+		handlers: cloneDispatchTable(jsonrpcHandlers),
+	}
+}
+
+func decodeRPCResponse(t *testing.T, body []byte) RPCResponse {
+	t.Helper()
+	var response RPCResponse
+	require.NoError(t, json.Unmarshal(body, &response))
+	return response
+}
+
+func decodeRPCBatch(t *testing.T, body []byte) []RPCResponse {
+	t.Helper()
+	var responses []RPCResponse
+	require.NoError(t, json.Unmarshal(body, &responses))
+	return responses
+}
+
+func requireRPCError(t *testing.T, response RPCResponse, id any, code int) {
+	t.Helper()
+	require.Equal(t, "2.0", response.JSONRPC)
+	require.Equal(t, id, decodeRPCID(t, response.ID))
+	require.NotNil(t, response.Error)
+	require.Equal(t, code, response.Error.Code)
+}
+
+func decodeRPCID(t *testing.T, id json.RawMessage) any {
+	t.Helper()
+	var decoded any
+	require.NoError(t, json.Unmarshal(id, &decoded))
+	return decoded
+}
+
+func TestListOutputsRejectsEmptyOutputTypeList(t *testing.T) {
+	s := newBatchTestService()
+	rr := serveRPC(t, s, []byte(`{
+		"jsonrpc":"2.0",
+		"method":"cartesi_listOutputs",
+		"params":{"application":"app","output_type":[]},
+		"id":1
+	}`))
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	response := decodeRPCResponse(t, rr.Body.Bytes())
+	requireRPCError(t, response, float64(1), JSONRPC_INVALID_PARAMS)
+	require.Equal(t, "Invalid output type: expected at least one selector", response.Error.Message)
+}
+
+func TestListOutputsRejectsMalformedOutputType(t *testing.T) {
+	for name, selector := range map[string]string{
+		"wrong length": "0x1234",
+		"non hex":      "0xzzzzzzzz",
+	} {
+		t.Run(name, func(t *testing.T) {
+			s := newBatchTestService()
+			body := []byte(fmt.Sprintf(`{
+				"jsonrpc":"2.0",
+				"method":"cartesi_listOutputs",
+				"params":{"application":"app","output_type":%q},
+				"id":1
+			}`, selector))
+			rr := serveRPC(t, s, body)
+
+			require.Equal(t, http.StatusOK, rr.Code)
+			response := decodeRPCResponse(t, rr.Body.Bytes())
+			requireRPCError(t, response, float64(1), JSONRPC_INVALID_PARAMS)
+			require.Contains(t, response.Error.Message, "Invalid output type")
+		})
+	}
+}
+
+func TestJSONRPCBatchRejectsEmptyBatchWithSingleObject(t *testing.T) {
+	s := newBatchTestService()
+	rr := serveRPC(t, s, []byte(`[]`))
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	require.Equal(t, "application/json", rr.Header().Get("Content-Type"))
+	requireRPCError(t, decodeRPCResponse(t, rr.Body.Bytes()), nil, JSONRPC_INVALID_BATCH)
+
+	var array []RPCResponse
+	require.Error(t, json.Unmarshal(rr.Body.Bytes(), &array),
+		"an empty batch error must be one JSON-RPC object, not an array")
+}
+
+func TestJSONRPCBatchRejectsMoreThanMaximumBeforeDispatch(t *testing.T) {
+	s := newBatchTestService()
+	var calls atomic.Int32
+	const method = "test_batch_cap"
+	withTestRPCHandler(t, s, method, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		calls.Add(1)
+		return true, nil
+	})
+
+	requests := make([]json.RawMessage, testBatchSize+1)
+	for i := range requests {
+		requests[i] = json.RawMessage(fmt.Sprintf(
+			`{"jsonrpc":"2.0","method":%q,"id":%d}`, method, i))
+	}
+	body, err := json.Marshal(requests)
+	require.NoError(t, err)
+	rr := serveRPC(t, s, body)
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	requireRPCError(t, decodeRPCResponse(t, rr.Body.Bytes()), nil, JSONRPC_INVALID_BATCH)
+	require.Zero(t, calls.Load(), "an oversized batch must be rejected before dispatch")
+}
+
+func TestJSONRPCMalformedBatchReturnsParseErrorObject(t *testing.T) {
+	s := newBatchTestService()
+	rr := serveRPC(t, s, []byte(`[{"jsonrpc":"2.0","method":"rpc.discover","id":1},`))
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	require.Equal(t, "application/json", rr.Header().Get("Content-Type"))
+	response := decodeRPCResponse(t, rr.Body.Bytes())
+	requireRPCError(t, response, nil, JSONRPC_PARSE_ERROR)
+	require.Equal(t, "Parse error", response.Error.Message)
+}
+
+func TestJSONRPCMalformedObjectReturnsJSONContentType(t *testing.T) {
+	s := newBatchTestService()
+	rr := serveRPC(t, s, []byte(`{"jsonrpc":"2.0"`))
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	require.Equal(t, "application/json", rr.Header().Get("Content-Type"))
+	response := decodeRPCResponse(t, rr.Body.Bytes())
+	requireRPCError(t, response, nil, JSONRPC_PARSE_ERROR)
+	require.Equal(t, "Parse error", response.Error.Message)
+}
+
+func TestJSONRPCDiscoverPreservesLargeIntegerLiterals(t *testing.T) {
+	s := newBatchTestService()
+	data, err := discoverSpec.ReadFile("jsonrpc-discover.json")
+	require.NoError(t, err)
+	require.NoError(t, json.Unmarshal(data, &s.discoverSpec))
+
+	rr := serveRPC(t, s, []byte(`{"jsonrpc":"2.0","method":"rpc.discover","id":1}`))
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	require.Contains(t, rr.Body.String(), `"maximum":9223372036854775807`)
+}
+
+func TestJSONRPCBatchMalformedElementDoesNotPoisonValidSiblings(t *testing.T) {
+	s := newBatchTestService()
+	body := []byte(`[
+		{"jsonrpc":"2.0","method":"cartesi_getNodeVersion","id":1},
+		17,
+		{"jsonrpc":"2.0","method":"cartesi_getNodeVersion","id":3}
+	]`)
+	rr := serveRPC(t, s, body)
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	responses := decodeRPCBatch(t, rr.Body.Bytes())
+	require.Len(t, responses, 3)
+	require.Nil(t, responses[0].Error)
+	require.EqualValues(t, 1, decodeRPCID(t, responses[0].ID))
+	requireRPCError(t, responses[1], nil, JSONRPC_INVALID_REQUEST)
+	require.Nil(t, responses[2].Error)
+	require.EqualValues(t, 3, decodeRPCID(t, responses[2].ID))
+}
+
+func TestJSONRPCBatchStructurallyInvalidElementsDoNotPoisonValidSiblings(t *testing.T) {
+	tests := map[string]struct {
+		request string
+		id      any
+	}{
+		"null":            {request: `null`},
+		"empty object":    {request: `{}`},
+		"missing method":  {request: `{"jsonrpc":"2.0","id":2}`, id: float64(2)},
+		"invalid version": {request: `{"jsonrpc":"1.0","method":"cartesi_getNodeVersion","id":2}`, id: float64(2)},
+		"invalid id":      {request: `{"jsonrpc":"2.0","method":"cartesi_getNodeVersion","id":true}`},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			s := newBatchTestService()
+			body := []byte(fmt.Sprintf(`[
+				{"jsonrpc":"2.0","method":"cartesi_getNodeVersion","id":1},
+				%s,
+				{"jsonrpc":"2.0","method":"cartesi_getNodeVersion","id":3}
+			]`, test.request))
+			rr := serveRPC(t, s, body)
+
+			require.Equal(t, http.StatusOK, rr.Code)
+			responses := decodeRPCBatch(t, rr.Body.Bytes())
+			require.Len(t, responses, 3)
+
+			require.Nil(t, responses[0].Error)
+			require.EqualValues(t, 1, decodeRPCID(t, responses[0].ID))
+
+			requireRPCError(t, responses[1], test.id, JSONRPC_INVALID_REQUEST)
+
+			require.Nil(t, responses[2].Error)
+			require.EqualValues(t, 3, decodeRPCID(t, responses[2].ID))
+		})
+	}
+}
+
+func TestJSONRPCValidationErrorsEchoValidID(t *testing.T) {
+	s := newBatchTestService()
+	tests := map[string]struct {
+		body    string
+		id      any
+		message string
+	}{
+		"missing method": {
+			body: `{"jsonrpc":"2.0","id":"request-id"}`, id: "request-id", message: "Invalid Request",
+		},
+		"invalid version": {
+			body: `{"jsonrpc":"1.0","method":"cartesi_getNodeVersion","id":42}`, id: float64(42), message: "Unsupported JSON-RPC version",
+		},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			response := decodeRPCResponse(t, serveRPC(t, s, []byte(test.body)).Body.Bytes())
+			requireRPCError(t, response, test.id, JSONRPC_INVALID_REQUEST)
+			require.Equal(t, test.message, response.Error.Message)
+		})
+	}
+}
+
+func TestJSONRPCRejectsInvalidIDTypesWithNullID(t *testing.T) {
+	s := newBatchTestService()
+	for name, id := range map[string]string{
+		"boolean": `true`,
+		"array":   `[]`,
+		"object":  `{}`,
+	} {
+		t.Run(name, func(t *testing.T) {
+			body := []byte(fmt.Sprintf(
+				`{"jsonrpc":"2.0","method":"cartesi_getNodeVersion","id":%s}`, id))
+			response := decodeRPCResponse(t, serveRPC(t, s, body).Body.Bytes())
+			requireRPCError(t, response, nil, JSONRPC_INVALID_REQUEST)
+			require.Equal(t, "Invalid request ID", response.Error.Message)
+		})
+	}
+}
+
+func TestRPCIDRoundTripsWithoutNumericPrecisionLoss(t *testing.T) {
+	s := newBatchTestService()
+	single := serveRPC(t, s, []byte(`{
+		"jsonrpc":"2.0",
+		"method":"cartesi_getNodeVersion",
+		"id":9007199254740993
+	}`))
+	singleResponse := decodeRPCResponse(t, single.Body.Bytes())
+	require.Nil(t, singleResponse.Error)
+	require.Equal(t, `9007199254740993`, string(singleResponse.ID))
+
+	rr := serveRPC(t, s, []byte(`[
+		{"jsonrpc":"2.0","method":"missing","id":9007199254740993},
+		{"jsonrpc":"2.0","method":"missing","id":18446744073709551616},
+		{"jsonrpc":"2.0","method":"missing","id":"request-3"}
+	]`))
+
+	responses := decodeRPCBatch(t, rr.Body.Bytes())
+	require.Len(t, responses, 3)
+	require.Equal(t, `9007199254740993`, string(responses[0].ID))
+	require.Equal(t, `18446744073709551616`, string(responses[1].ID))
+	require.Equal(t, `"request-3"`, string(responses[2].ID))
+	for _, response := range responses {
+		require.NotNil(t, response.Error)
+		require.Equal(t, JSONRPC_METHOD_NOT_FOUND, response.Error.Code)
+	}
+}
+
+func TestJSONRPCBatchNotificationsReceiveNullIDResponses(t *testing.T) {
+	s := newBatchTestService()
+	rr := serveRPC(t, s, []byte(`[
+		{"jsonrpc":"2.0","method":"cartesi_getNodeVersion"},
+		{"jsonrpc":"2.0","method":"does_not_exist"}
+	]`))
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	responses := decodeRPCBatch(t, rr.Body.Bytes())
+	require.Len(t, responses, 2, "notifications are deliberately answered by this server")
+	require.Nil(t, decodeRPCID(t, responses[0].ID))
+	require.Nil(t, responses[0].Error)
+	requireRPCError(t, responses[1], nil, JSONRPC_METHOD_NOT_FOUND)
+}
+
+func TestJSONRPCBatchAlwaysReturnsHTTP200ForJSONErrors(t *testing.T) {
+	s := newBatchTestService()
+	tests := map[string][]byte{
+		"parse error":     []byte(`[nope`),
+		"invalid request": []byte(`[]`),
+		"error entries":   []byte(`[false,{"jsonrpc":"2.0","method":"does_not_exist","id":2}]`),
+	}
+	for name, body := range tests {
+		t.Run(name, func(t *testing.T) {
+			rr := serveRPC(t, s, body)
+			require.Equal(t, http.StatusOK, rr.Code)
+			require.Equal(t, "application/json", rr.Header().Get("Content-Type"))
+			require.True(t, json.Valid(rr.Body.Bytes()))
+		})
+	}
+}
+
+func TestJSONRPCBatchReplacesResponsesAtCumulativeResponseBudget(t *testing.T) {
+	s := newBatchTestService()
+	var calls atomic.Int32
+	const method = "test_large_batch_result"
+	largeResult := strings.Repeat("x", testLargeResultSize)
+	withTestRPCHandler(t, s, method, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		calls.Add(1)
+		return largeResult, nil
+	})
+
+	requests := make([]json.RawMessage, testBatchSize)
+	for i := range requests {
+		requests[i] = json.RawMessage(fmt.Sprintf(
+			`{"jsonrpc":"2.0","method":%q,"params":{"limit":10000},"id":%d}`, method, i))
+	}
+	body, err := json.Marshal(requests)
+	require.NoError(t, err)
+	require.Less(t, len(body), 10<<10, "the request cap must not be mistaken for a response cap")
+	rr := serveRPC(t, s, body)
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	responses := decodeRPCBatch(t, rr.Body.Bytes())
+	require.Len(t, responses, testBatchSize)
+	require.Equal(t, int32(testBatchSuccessCount+1), calls.Load())
+	require.LessOrEqual(t, rr.Body.Len(), (10<<20)+testResponseBudgetSlack)
+	for i := range responses[:testBatchSuccessCount] {
+		require.Equal(t, "2.0", responses[i].JSONRPC)
+		require.Equal(t, float64(i), decodeRPCID(t, responses[i].ID))
+		require.Nil(t, responses[i].Error)
+		require.Equal(t, responses[i].Result, largeResult)
+	}
+	for i := testBatchSuccessCount; i < len(responses); i++ {
+		requireRPCError(t, responses[i], float64(i), JSONRPC_RESPONSE_SIZE_LIMIT_EXCEEDED)
+		require.Equal(t, "Response size limit exceeded", responses[i].Error.Message)
+	}
+}
+
+func TestJSONRPCBatchStopsBetweenEntriesWhenContextIsCanceled(t *testing.T) {
+	s := newBatchTestService()
+	var calls atomic.Int32
+	var logs bytes.Buffer
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	ctx, cancel := context.WithCancel(context.Background())
+	const method = "test_cancel_batch"
+	withTestRPCHandler(t, s, method, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		calls.Add(1)
+		cancel()
+		return true, nil
+	})
+
+	body := []byte(fmt.Sprintf(`[
+		{"jsonrpc":"2.0","method":%q,"id":1},
+		{"jsonrpc":"2.0","method":%q,"id":2},
+		{"jsonrpc":"2.0","method":%q,"id":3}
+	]`, method, method, method))
+	req := httptest.NewRequest(http.MethodPost, "/rpc", bytes.NewReader(body)).WithContext(ctx)
+	rr := httptest.NewRecorder()
+	s.handleRPC(rr, req)
+
+	require.Equal(t, int32(1), calls.Load(),
+		"a canceled request must not run the remaining batch handlers")
+	for _, line := range strings.Split(strings.TrimSpace(logs.String()), "\n") {
+		if line == "" {
+			continue
+		}
+		var record map[string]any
+		require.NoError(t, json.Unmarshal([]byte(line), &record))
+		require.False(t,
+			record["level"] == "ERROR" && strings.Contains(strings.ToLower(line), "context canceled"),
+			"context.Canceled is a graceful stop and must not be ERROR logged")
+	}
+}
+
+func TestJSONRPCBatchStopsSilentlyWhenRepositoryCallIsCanceled(t *testing.T) {
+	s := newBatchTestService()
+	var calls atomic.Int32
+	var logs bytes.Buffer
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	ctx, cancel := context.WithCancel(context.Background())
+	const method = "test_repository_cancel_batch"
+	withTestRPCHandler(t, s, method, func(s *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		calls.Add(1)
+		cancel()
+		return nil, s.repositoryError(ctx, "Unable to retrieve test data from repository",
+			fmt.Errorf("repository query failed: %w", ctx.Err()))
+	})
+
+	body := []byte(fmt.Sprintf(`[
+		{"jsonrpc":"2.0","method":%q,"id":1},
+		{"jsonrpc":"2.0","method":%q,"id":2}
+	]`, method, method))
+	req := httptest.NewRequest(http.MethodPost, "/rpc", bytes.NewReader(body)).WithContext(ctx)
+	rr := httptest.NewRecorder()
+	s.handleRPC(rr, req)
+
+	require.Equal(t, int32(1), calls.Load())
+	require.NotContains(t, rr.Body.String(), "Internal server error")
+	for _, line := range strings.Split(strings.TrimSpace(logs.String()), "\n") {
+		if line == "" {
+			continue
+		}
+		var record map[string]any
+		require.NoError(t, json.Unmarshal([]byte(line), &record))
+		require.NotEqual(t, "ERROR", record["level"],
+			"context.Canceled must not be logged as an operator error")
+	}
+}
+
+func TestJSONRPCBatchReturnsErrorsForIDDRequestsAfterDeadline(t *testing.T) {
+	s := newBatchTestService()
+	var calls atomic.Int32
+	const method = "test_deadline_batch"
+	withTestRPCHandler(t, s, method, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		calls.Add(1)
+		return true, nil
+	})
+
+	body := []byte(fmt.Sprintf(`[
+		{"jsonrpc":"2.0","method":%q,"id":1},
+		{"jsonrpc":"2.0","method":%q},
+		{"jsonrpc":"2.0","method":%q,"id":"three"},
+		false,
+		{"jsonrpc":"2.0","method":%q,"id":true},
+		{"jsonrpc":"2.0","method":%q,"id":null}
+	]`, method, method, method, method, method))
+	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(-time.Second))
+	defer cancel()
+	req := httptest.NewRequest(http.MethodPost, "/rpc", bytes.NewReader(body)).WithContext(ctx)
+	rr := httptest.NewRecorder()
+	s.handleRPC(rr, req)
+
+	require.Zero(t, calls.Load(), "expired batch entries must not be dispatched")
+	responses := decodeRPCBatch(t, rr.Body.Bytes())
+	require.Len(t, responses, 6, "not all entries receive deadline errors")
+	requireRPCError(t, responses[0], float64(1), JSONRPC_TIMEOUT_ERROR)
+	requireRPCError(t, responses[1], nil, JSONRPC_TIMEOUT_ERROR)
+	requireRPCError(t, responses[2], "three", JSONRPC_TIMEOUT_ERROR)
+	requireRPCError(t, responses[3], nil, JSONRPC_INVALID_REQUEST)
+	requireRPCError(t, responses[4], nil, JSONRPC_INVALID_REQUEST)
+	requireRPCError(t, responses[5], nil, JSONRPC_TIMEOUT_ERROR)
+	for i, response := range responses {
+		if i == 3 {
+			require.Equal(t, "Invalid Request", response.Error.Message)
+		} else if i == 4 {
+			require.Equal(t, "Invalid request ID", response.Error.Message)
+		} else {
+			require.Equal(t, "Request timed out", response.Error.Message)
+		}
+	}
+}
+
+func TestJSONRPCSingleRequestReturnsTimeoutWhenItsContextExpires(t *testing.T) {
+	s := newBatchTestService()
+	s.dispatchTimeout = 5 * time.Millisecond
+	var logs bytes.Buffer
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	const method = "test_single_request_timeout"
+	withTestRPCHandler(t, s, method, func(s *Service, r *http.Request, _ RPCRequest) (any, error) {
+		<-r.Context().Done()
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve test data from repository",
+			fmt.Errorf("repository query failed: %w", r.Context().Err()))
+	})
+
+	rr := serveRPC(t, s, []byte(fmt.Sprintf(
+		`{"jsonrpc":"2.0","method":%q,"id":1}`, method)))
+	response := decodeRPCResponse(t, rr.Body.Bytes())
+	requireRPCError(t, response, float64(1), JSONRPC_TIMEOUT_ERROR)
+	require.Equal(t, "Request timed out", response.Error.Message)
+	require.Contains(t, logs.String(), "RPC method dispatch timeout")
+	require.NotContains(t, logs.String(), `"level":"ERROR"`)
+}
+
+func TestJSONRPCUpstreamDeadlineRemainsInternalError(t *testing.T) {
+	s := newBatchTestService()
+	var logs bytes.Buffer
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	const method = "test_upstream_deadline"
+	withTestRPCHandler(t, s, method, func(s *Service, r *http.Request, _ RPCRequest) (any, error) {
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve test data from repository",
+			fmt.Errorf("upstream deadline: %w", context.DeadlineExceeded))
+	})
+
+	rr := serveRPC(t, s, []byte(fmt.Sprintf(
+		`{"jsonrpc":"2.0","method":%q,"id":1}`, method)))
+	response := decodeRPCResponse(t, rr.Body.Bytes())
+	requireRPCError(t, response, float64(1), JSONRPC_INTERNAL_ERROR)
+	require.Contains(t, logs.String(), `"level":"ERROR"`)
+}
+
+func TestJSONRPCBatchRecoversPanicPerEntry(t *testing.T) {
+	s := newBatchTestService()
+	var logs bytes.Buffer
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	panicMethod := strings.Repeat("p", MAX_LOGGED_METHOD_LEN+32)
+	const okMethod = "test_after_panic_batch"
+	withTestRPCHandler(t, s, panicMethod, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		panic("test panic")
+	})
+	withTestRPCHandler(t, s, okMethod, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		return "ok", nil
+	})
+
+	body := []byte(fmt.Sprintf(`[
+		{"jsonrpc":"2.0","method":%q,"id":1},
+		{"jsonrpc":"2.0","method":%q,"id":2},
+		{"jsonrpc":"2.0","method":%q,"id":3}
+	]`, okMethod, panicMethod, okMethod))
+	rr := serveRPC(t, s, body)
+
+	responses := decodeRPCBatch(t, rr.Body.Bytes())
+	require.Len(t, responses, 3)
+	require.Nil(t, responses[0].Error)
+	requireRPCError(t, responses[1], float64(2), JSONRPC_INTERNAL_ERROR)
+	require.Equal(t, "Internal server error", responses[1].Error.Message)
+	require.Nil(t, responses[2].Error, "entries after a panic must still be dispatched")
+	require.Contains(t, logs.String(), "RPC method panic")
+	require.Contains(t, logs.String(), "test panic")
+	require.Contains(t, logs.String(), "goroutine", "panic log must include a stack trace")
+	require.Contains(t, logs.String(), truncatedMethod(panicMethod))
+	require.NotContains(t, logs.String(), panicMethod)
+}
+
+func TestJSONRPCDoesNotRecoverAbortHandler(t *testing.T) {
+	s := newBatchTestService()
+	const method = "test_abort_handler"
+	withTestRPCHandler(t, s, method, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		panic(http.ErrAbortHandler)
+	})
+
+	require.PanicsWithValue(t, http.ErrAbortHandler, func() {
+		serveRPC(t, s, []byte(fmt.Sprintf(
+			`{"jsonrpc":"2.0","method":%q,"id":1}`, method)))
+	})
+}
+
+func TestJSONRPCBatchUsesOneAdmissionPermit(t *testing.T) {
+	s := newBatchTestService()
+	s.admission = service.NewSemaphoreAdmission(1)
+	s.server = &http.Server{
+		Handler:           rebuildHandlerWithAdmission(s),
+		ReadHeaderTimeout: 2 * time.Second,
+	}
+	var nestedAcquisitions atomic.Int32
+	const method = "test_batch_admission"
+	withTestRPCHandler(t, s, method, func(s *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		if s.admission.TryAcquire() {
+			nestedAcquisitions.Add(1)
+			s.admission.Release()
+		}
+		return true, nil
+	})
+
+	body := []byte(fmt.Sprintf(`[
+		{"jsonrpc":"2.0","method":%q,"id":1},
+		{"jsonrpc":"2.0","method":%q,"id":2}
+	]`, method, method))
+	req := httptest.NewRequest(http.MethodPost, "/rpc", bytes.NewReader(body))
+	rr := httptest.NewRecorder()
+	s.server.Handler.ServeHTTP(rr, req)
+
+	require.Equal(t, http.StatusOK, rr.Code)
+	require.Zero(t, nestedAcquisitions.Load(),
+		"the HTTP request's one permit must remain held for the whole batch")
+	require.Len(t, decodeRPCBatch(t, rr.Body.Bytes()), 2)
+}
+
+func TestJSONRPCBatchLoggingHasOneInfoAndDebugMethods(t *testing.T) {
+	s := newBatchTestService()
+	var logs bytes.Buffer
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))
+
+	const entries = 3
+	body := []byte(`[
+		{"jsonrpc":"2.0","method":"attacker_method_0","id":0},
+		{"jsonrpc":"2.0","method":"attacker_method_1","id":1},
+		{"jsonrpc":"2.0","method":"attacker_method_2","id":2}
+	]`)
+	serveRPC(t, s, body)
+
+	var batchInfo int
+	debugMethods := map[string]bool{}
+	for _, line := range strings.Split(strings.TrimSpace(logs.String()), "\n") {
+		if line == "" {
+			continue
+		}
+		var record map[string]any
+		require.NoError(t, json.Unmarshal([]byte(line), &record))
+		level, _ := record["level"].(string)
+		encoded := string(line)
+		if level == "INFO" && strings.Contains(strings.ToLower(encoded), "batch") {
+			batchInfo++
+			require.Contains(t, encoded, fmt.Sprint(entries))
+		}
+		for i := range entries {
+			method := fmt.Sprintf("attacker_method_%d", i)
+			if strings.Contains(encoded, method) {
+				require.Equal(t, "DEBUG", level, "per-entry method names must never be Info logged")
+				debugMethods[method] = true
+			}
+		}
+	}
+	require.Equal(t, 1, batchInfo)
+	require.Len(t, debugMethods, entries)
+}
+
+func TestJSONRPCBatchMethodLoggingIsTruncated(t *testing.T) {
+	s := newBatchTestService()
+	var logs bytes.Buffer
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	method := strings.Repeat("b", MAX_LOGGED_METHOD_LEN+32)
+	body := []byte(fmt.Sprintf(`[{"jsonrpc":"2.0","method":%q,"id":1}]`, method))
+	serveRPC(t, s, body)
+
+	var found bool
+	for _, line := range strings.Split(strings.TrimSpace(logs.String()), "\n") {
+		var record map[string]any
+		require.NoError(t, json.Unmarshal([]byte(line), &record))
+		if record["method"] == truncatedMethod(method) {
+			require.Equal(t, "DEBUG", record["level"])
+			found = true
+		}
+		require.NotEqual(t, method, record["method"])
+	}
+	require.True(t, found)
+}
+
+func withTestRPCHandler(t *testing.T, service *Service, method string, handler rpcHandler) {
+	t.Helper()
+	previous, existed := service.handlers[method]
+	service.handlers[method] = handler
+	t.Cleanup(func() {
+		if existed {
+			service.handlers[method] = previous
+		} else {
+			delete(service.handlers, method)
+		}
+	})
+}
+
+func TestRPCHandlerOverridesAreServiceLocal(t *testing.T) {
+	first := newBatchTestService()
+	second := newBatchTestService()
+	const method = "test_service_local_handler"
+	withTestRPCHandler(t, first, method, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		return true, nil
+	})
+
+	_, firstHasHandler := first.handlers[method]
+	_, secondHasHandler := second.handlers[method]
+	_, globalHasHandler := jsonrpcHandlers[method]
+	require.True(t, firstHasHandler)
+	require.False(t, secondHasHandler)
+	require.False(t, globalHasHandler)
+}
diff --git a/internal/jsonrpc/decode_logging_test.go b/internal/jsonrpc/decode_logging_test.go
new file mode 100644
index 000000000..92d2f9cc4
--- /dev/null
+++ b/internal/jsonrpc/decode_logging_test.go
@@ -0,0 +1,64 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package jsonrpc
+
+import (
+	"bytes"
+	"encoding/json"
+	"log/slog"
+	"testing"
+
+	"github.com/cartesi/rollups-node/internal/model"
+	contractinputs "github.com/cartesi/rollups-node/pkg/contracts/inputs"
+	contractoutputs "github.com/cartesi/rollups-node/pkg/contracts/outputs"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestDecodeFailuresAreAggregatedInLogs(t *testing.T) {
+	inputABI, err := contractinputs.InputsMetaData.GetAbi()
+	require.NoError(t, err)
+	outputABI, err := contractoutputs.OutputsMetaData.GetAbi()
+	require.NoError(t, err)
+
+	var logs bytes.Buffer
+	s := newBatchTestService()
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	s.inputABI = inputABI
+	s.outputABI = outputABI
+
+	decodedInputs := s.decodeInputs("app", []*model.Input{
+		{Index: 7, RawData: nil},
+		{Index: 9, RawData: []byte{0x01}},
+	})
+	decodedOutputs := s.decodeOutputs("app", []*model.Output{
+		{Index: 11, RawData: nil},
+		{Index: 13, RawData: []byte{0x01}},
+	})
+	require.Len(t, decodedInputs, 2, "malformed rows must remain in the response")
+	require.Len(t, decodedOutputs, 2, "malformed rows must remain in the response")
+
+	debugCount := 0
+	warns := map[string]map[string]any{}
+	for _, line := range bytes.Split(bytes.TrimSpace(logs.Bytes()), []byte("\n")) {
+		var record map[string]any
+		require.NoError(t, json.Unmarshal(line, &record))
+		switch record["level"] {
+		case "DEBUG":
+			debugCount++
+		case "WARN":
+			message, _ := record["msg"].(string)
+			warns[message] = record
+		case "ERROR":
+			t.Fatalf("decode failure was logged at Error: %s", line)
+		}
+	}
+
+	require.Equal(t, 4, debugCount, "each malformed row needs one diagnostic Debug log")
+	require.Len(t, warns, 2, "inputs and outputs each need one aggregate warning")
+	require.Equal(t, float64(2), warns["Unable to decode Inputs"]["count"])
+	require.Equal(t, float64(7), warns["Unable to decode Inputs"]["first_index"])
+	require.Equal(t, float64(2), warns["Unable to decode Outputs"]["count"])
+	require.Equal(t, float64(11), warns["Unable to decode Outputs"]["first_index"])
+}
diff --git a/internal/jsonrpc/jsonrpc-discover.json b/internal/jsonrpc/jsonrpc-discover.json
index ea2b43c12..5d72106e2 100644
--- a/internal/jsonrpc/jsonrpc-discover.json
+++ b/internal/jsonrpc/jsonrpc-discover.json
@@ -3,7 +3,12 @@
 	"info": {
 		"title": "Cartesi Rollups Node API",
 		"version": "2.0.0",
-		"description": "A JSON-RPC API for reading rollups data. It provides information about applications, epochs, inputs, outputs, and reports in a read-only fashion.\n\nError handling: every method documents its possible errors under `errors`, and clients can dispatch on the error code. `-32002` (application not found) means the application identifier itself is unknown to this node; for application-scoped methods, this is a configuration error that will not resolve by retrying. `-32001` (resource not found) means the requested resource does not exist in the method's scope. For application-scoped methods, `-32001` means the application is known but the nested entity is missing; for node-scoped methods, it can also report missing node resources such as EVM reader configuration. For forward-looking application resources (e.g. the next epoch, input, or output index), `-32001` is the documented \"not created yet\" signal and is safe to poll. The error message names the missing resource. `-32603` (internal error) is never used for missing resources - clients should treat it as a node-side failure and alarm or back off, not poll. The transport-level codes `-32700` (parse error), `-32600` (invalid request), and `-32601` (method not found) follow the JSON-RPC 2.0 specification."
+		"x-batch-list-work-budget": {
+			"maximum": 10000,
+			"unit": "sum of effective limit values across list entries",
+			"description": "Before dispatching any entry, the server sums the effective limit of every list operation in a batch. Omitted or zero limits count as 50, and limits above 10000 count as 10000. A total above 10000 rejects the entire batch with one error response using code -31004; no entry is dispatched. This bounds row-fetch work to that of one maximal list request. It does not bound the cost of COUNT queries. It also does not meter offset traversal cost: that cost is bounded by the size of the filtered set rather than by the numeric offset value, but PostgreSQL may still scan and discard matching rows before the requested page. Clients should still avoid broad or unnecessary list filters."
+		},
+		"description": "A JSON-RPC API for reading rollups data. It provides information about applications, epochs, inputs, outputs, and reports in a read-only fashion.\n\nResponse limits: every HTTP request has a 10 MB response-size budget. For a single JSON-RPC request, its response must fit within that budget. For a batch, the budget is cumulative across all entries. An entry that would exceed the remaining budget is discarded without consuming it and receives error `-31003`; the budget is then closed, so every remaining batch entry also receives `-31003`, even if its response would otherwise fit. Clients can retry an affected entry individually or in a smaller batch.\n\nBatch requests: JSON-RPC non-empty batch arrays are supported with a maximum of 100 entries per batch; batches outside that size range receive a single response with error code `-32040`. Entries execute sequentially and responses are returned in the same order as their requests. The 1 MB request-body limit applies to the whole batch array. Every batch entry receives a response. Notification suppression is not supported: entries without an ID are answered with `id: null`. This is a documented deviation from JSON-RPC 2.0, under which notifications normally produce no response. A batch response uses HTTP status 200 even when some or all of its entries are errors. Because execution is sequential and subject to the server time limit, heavy list calls should be kept outside large batches.\n\nError handling: every method documents its possible errors under `errors`, and clients can dispatch on the error code. `-31002` (application not found) means the application identifier itself is unknown to this node; for application-scoped methods, this is a configuration error that will not resolve by retrying. `-31001` (resource not found) means the requested resource does not exist in the method's scope. For application-scoped methods, `-31001` means the application is known but the nested entity is missing; for node-scoped methods, it can also report missing node resources such as EVM reader configuration. For forward-looking application resources (e.g. the next epoch, input, or output index), `-31001` is the documented \"not created yet\" signal and is safe to poll. The error message names the missing resource. `-32603` (internal error) is never used for missing resources - clients should treat it as a node-side failure and alarm or back off, not poll. `-32070` (timeout error) indicates the request was not able to be processed in the time limit available. The standard codes `-32700` (parse error), `-32600` (invalid request), and `-32601` (method not found) follow the JSON-RPC 2.0 specification."
 	},
 	"methods": [
 		{
@@ -27,6 +32,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -53,6 +59,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -85,13 +97,19 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
 		{
 			"name": "cartesi_listEpochs",
 			"summary": "List epochs",
-			"description": "Returns a paginated list of epochs for the specified application. Can filter by epoch status.",
+			"description": "Returns a paginated list of epochs for the specified application. Can filter by one or more epoch statuses.\n\nTo synchronize epochs, request `from` equal to the next unseen epoch index and advance it as new epochs appear. Separately, repeatedly filter previously seen epochs by the non-terminal statuses `OPEN`, `CLOSED`, `INPUTS_PROCESSED`, `CLAIM_COMPUTED`, `CLAIM_SUBMITTED`, and `CLAIM_STAGED`. Terminal statuses (`CLAIM_ACCEPTED`, `CLAIM_REJECTED`, and `CLAIM_FORECLOSED`) never regress, so settled epochs can be removed from the status-refresh set while `from` continues discovering new epochs.",
 			"params": [
 				{
 					"name": "application",
@@ -103,9 +121,20 @@
 				},
 				{
 					"name": "status",
-					"description": "Filter epochs by status.",
+					"description": "Filter epochs by one status or a non-empty list of statuses. Omit this parameter to disable status filtering; an empty list is invalid.",
 					"schema": {
-						"$ref": "#/components/schemas/EpochStatus"
+						"oneOf": [
+							{
+								"$ref": "#/components/schemas/EpochStatus"
+							},
+							{
+								"type": "array",
+								"items": {
+									"$ref": "#/components/schemas/EpochStatus"
+								},
+								"minItems": 1
+							}
+						]
 					},
 					"required": false
 				},
@@ -125,6 +154,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -137,6 +167,22 @@
 						"default": false
 					},
 					"required": false
+				},
+				{
+					"name": "from",
+					"description": "Inclusive lower bound on the epoch index (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": false
+				},
+				{
+					"name": "to",
+					"description": "Inclusive upper bound on the epoch index (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": false
 				}
 			],
 			"result": {
@@ -155,6 +201,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -198,6 +250,61 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
+				}
+			]
+		},
+		{
+			"name": "cartesi_getEpochByVirtualIndex",
+			"summary": "Get a specific epoch by its virtual index",
+			"description": "Fetches a single epoch by application and its virtual index, which is the epoch's dense insertion rank — 0, 1, 2, … with no gaps by construction.",
+			"params": [
+				{
+					"name": "application",
+					"description": "The application's name or hex encoded address.",
+					"schema": {
+						"$ref": "#/components/schemas/NameOrAddress"
+					},
+					"required": true
+				},
+				{
+					"name": "virtual_index",
+					"description": "The virtual index of the epoch to be retrieved (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": true
+				}
+			],
+			"result": {
+				"name": "result",
+				"schema": {
+					"$ref": "#/components/schemas/EpochGetResult"
+				}
+			},
+			"errors": [
+				{
+					"$ref": "#/components/errors/InvalidParams"
+				},
+				{
+					"$ref": "#/components/errors/ApplicationNotFound"
+				},
+				{
+					"$ref": "#/components/errors/EpochNotFound"
+				},
+				{
+					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -233,6 +340,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -289,6 +402,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -301,6 +415,22 @@
 						"default": false
 					},
 					"required": false
+				},
+				{
+					"name": "from",
+					"description": "Inclusive lower bound on the input index (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": false
+				},
+				{
+					"name": "to",
+					"description": "Inclusive upper bound on the input index (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": false
 				}
 			],
 			"result": {
@@ -318,6 +448,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -361,6 +497,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -393,13 +535,95 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
+				}
+			]
+		},
+		{
+			"name": "cartesi_getExecutedOutputCount",
+			"summary": "Retrieve the number of executed outputs for the application",
+			"description": "Returns a monotone change signal for output execution. An unchanged count means that no new executions have been observed. When the count changes, re-query the bounded executable-output working set with cartesi_listOutputs using executed=false and output_type=[voucher, delegatecall_voucher], then diff that pending set against the previous result to identify executions. Do not use this count, an output index, or a pagination offset as a resume cursor: executions are observed out of output-index order, so a late execution can occur behind such a cursor. A race-free execution cursor is expected in a future ingestion API.",
+			"params": [
+				{
+					"name": "application",
+					"description": "The application's name or hex encoded address.",
+					"schema": {
+						"$ref": "#/components/schemas/NameOrAddress"
+					},
+					"required": true
+				}
+			],
+			"result": {
+				"name": "result",
+				"schema": {
+					"$ref": "#/components/schemas/ExecutedOutputCountResult"
+				}
+			},
+			"errors": [
+				{
+					"$ref": "#/components/errors/InvalidParams"
+				},
+				{
+					"$ref": "#/components/errors/ApplicationNotFound"
+				},
+				{
+					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
+				}
+			]
+		},
+		{
+			"name": "cartesi_getPendingExecutableOutputCount",
+			"summary": "Retrieve the number of pending executable outputs for the application",
+			"description": "Returns a non-monotone gauge that grows with new executable outputs and shrinks with executions. Do not use it as a change signal or resume cursor. Instead poll cartesi_getExecutedOutputCount; when that monotone count changes, re-query the bounded executable-output working set with cartesi_listOutputs using executed=false and output_type=[voucher, delegatecall_voucher], then diff the pending set against the previous result.",
+			"params": [
+				{
+					"name": "application",
+					"description": "The application's name or hex encoded address.",
+					"schema": {
+						"$ref": "#/components/schemas/NameOrAddress"
+					},
+					"required": true
+				}
+			],
+			"result": {
+				"name": "result",
+				"schema": {
+					"$ref": "#/components/schemas/PendingExecutableOutputCountResult"
+				}
+			},
+			"errors": [
+				{
+					"$ref": "#/components/errors/InvalidParams"
+				},
+				{
+					"$ref": "#/components/errors/ApplicationNotFound"
+				},
+				{
+					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
 		{
 			"name": "cartesi_listOutputs",
 			"summary": "Retrieve a List of Outputs",
-			"description": "Returns a paginated list of outputs, with options to filter by epoch index, input index, output type and voucher address.",
+			"description": "Returns a paginated list of outputs, with options to filter by epoch index, input index, output type, voucher address, and execution status. Executions are observed out of output-index order: an old voucher can execute after newer outputs and therefore change behind an index- or offset-based cursor. Do not use output indexes, pagination offsets, or the executed-output count as resume cursors over the executed filter, because doing so can silently skip late executions. To synchronize executions, poll cartesi_getExecutedOutputCount; when it changes, re-query the bounded executable-output working set with executed=false and output_type=[voucher, delegatecall_voucher], then diff the pending set against the previous result. A race-free execution cursor is expected in a future ingestion API.",
 			"params": [
 				{
 					"name": "application",
@@ -427,9 +651,20 @@
 				},
 				{
 					"name": "output_type",
-					"description": "Filter outputs by output type (first 4 bytes of raw data hex encoded).",
+					"description": "Filter outputs by one or more output type selectors (the first 4 bytes of raw data, hex encoded). A single selector string is accepted for compatibility; arrays use OR semantics and must not be empty.",
 					"schema": {
-						"$ref": "#/components/schemas/FunctionSelector"
+						"oneOf": [
+							{
+								"$ref": "#/components/schemas/FunctionSelector"
+							},
+							{
+								"type": "array",
+								"minItems": 1,
+								"items": {
+									"$ref": "#/components/schemas/FunctionSelector"
+								}
+							}
+						]
 					},
 					"required": false
 				},
@@ -457,6 +692,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -469,6 +705,30 @@
 						"default": false
 					},
 					"required": false
+				},
+				{
+					"name": "from",
+					"description": "Inclusive lower bound on the output index (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": false
+				},
+				{
+					"name": "to",
+					"description": "Inclusive upper bound on the output index (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": false
+				},
+				{
+					"name": "executed",
+					"description": "Filter by execution status: true selects outputs with an execution transaction hash; false selects outputs without one. Executions are observed out of output-index order, so do not build a resume cursor over this filter from an output index, pagination offset, or executed-output count; it can silently skip late executions. Instead poll cartesi_getExecutedOutputCount and, when it changes, re-query the bounded executable-output working set with executed=false and output_type=[voucher, delegatecall_voucher], then diff the pending set against the previous result.",
+					"schema": {
+						"type": "boolean"
+					},
+					"required": false
 				}
 			],
 			"result": {
@@ -486,6 +746,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -529,6 +795,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -575,6 +847,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -587,6 +860,22 @@
 						"default": false
 					},
 					"required": false
+				},
+				{
+					"name": "from",
+					"description": "Inclusive lower bound on the report index (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": false
+				},
+				{
+					"name": "to",
+					"description": "Inclusive upper bound on the report index (hex encoded).",
+					"schema": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"required": false
 				}
 			],
 			"result": {
@@ -604,6 +893,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -647,6 +942,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -687,6 +988,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -716,6 +1018,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -759,6 +1067,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -823,6 +1137,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -852,6 +1167,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -895,6 +1216,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -943,6 +1270,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -972,6 +1300,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -1031,6 +1365,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -1079,6 +1419,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -1108,6 +1449,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -1167,6 +1514,12 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
@@ -1223,6 +1576,7 @@
 					"schema": {
 						"type": "integer",
 						"minimum": 0,
+						"maximum": 9223372036854775807,
 						"default": 0
 					},
 					"required": false
@@ -1252,11 +1606,17 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
 		{
-			"name": "cartesi_getMatchAdvanced",
+			"name": "cartesi_getMatchAdvance",
 			"summary": "Get a specific match advance",
 			"description": "Fetches a single match advance by application, epoch index, tournament address, ID hash and parent.",
 			"params": [
@@ -1319,13 +1679,46 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
+				}
+			]
+		},
+		{
+			"name": "cartesi_getNodeInfo",
+			"summary": "Get node information",
+			"description": "Fetches the chain ID, semantic node version, and default blockchain block tag used by the node. `default_block` is the node's finality contract for blockchain-derived data: it identifies the block tag (`FINALIZED`, `SAFE`, `LATEST`, or `PENDING`) up to which the node reads and acts on chain state. Clients should therefore interpret data exposed by this node with the stability guarantees of that tag.",
+			"params": [],
+			"result": {
+				"name": "result",
+				"schema": {
+					"$ref": "#/components/schemas/NodeInfoResult"
+				}
+			},
+			"errors": [
+				{
+					"$ref": "#/components/errors/NodeConfigNotFound"
+				},
+				{
+					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
 		{
 			"name": "cartesi_getChainId",
 			"summary": "Get node's chain ID",
-			"description": "Fetches the chain ID that node is operating on.",
+			"description": "Fetches the chain ID that the node is operating on. Deprecated: use `cartesi_getNodeInfo`, which returns the chain ID together with the node version and default blockchain block tag.",
+			"deprecated": true,
 			"params": [],
 			"result": {
 				"name": "result",
@@ -1339,20 +1732,38 @@
 				},
 				{
 					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
 				}
 			]
 		},
 		{
 			"name": "cartesi_getNodeVersion",
 			"summary": "Get node version",
-			"description": "Fetches the semantic version of the Cartesi rollups node.",
+			"description": "Fetches the semantic version of the Cartesi rollups node. Deprecated: use `cartesi_getNodeInfo`, which returns the node version together with the chain ID and default blockchain block tag.",
+			"deprecated": true,
 			"params": [],
 			"result": {
 				"name": "result",
 				"schema": {
 					"$ref": "#/components/schemas/NodeVersionResult"
 				}
-			}
+			},
+			"errors": [
+				{
+					"$ref": "#/components/errors/InternalError"
+				},
+				{
+					"$ref": "#/components/errors/TimeoutError"
+				},
+				{
+					"$ref": "#/components/errors/ResponseSizeLimitExceeded"
+				}
+			]
 		}
 	],
 	"components": {
@@ -1754,7 +2165,7 @@
 						"$ref": "#/components/schemas/UnsignedInteger"
 					},
 					"prev_randao": {
-						"$ref": "#/components/schemas/ByteArray"
+						"$ref": "#/components/schemas/UnsignedInteger256"
 					},
 					"index": {
 						"$ref": "#/components/schemas/UnsignedInteger"
@@ -1802,6 +2213,22 @@
 					}
 				}
 			},
+			"ExecutedOutputCountResult": {
+				"type": "object",
+				"properties": {
+					"data": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					}
+				}
+			},
+			"PendingExecutableOutputCountResult": {
+				"type": "object",
+				"properties": {
+					"data": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					}
+				}
+			},
 			"Output": {
 				"type": "object",
 				"properties": {
@@ -1887,7 +2314,8 @@
 						"$ref": "#/components/schemas/EthereumAddress"
 					},
 					"value": {
-						"type": "string"
+						"$ref": "#/components/schemas/UnsignedInteger256",
+						"description": "Amount of Wei transferred by the voucher's call"
 					},
 					"payload": {
 						"$ref": "#/components/schemas/ByteArray"
@@ -2121,6 +2549,37 @@
 					}
 				}
 			},
+			"NodeInfo": {
+				"type": "object",
+				"properties": {
+					"chain_id": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"version": {
+						"type": "string",
+						"format": "semver",
+						"pattern": "^[a-zA-Z0-9_-\\.]+$"
+					},
+					"default_block": {
+						"type": "string",
+						"description": "The block tag that defines the finality/stability level of blockchain-derived data read and acted on by this node.",
+						"enum": [
+							"FINALIZED",
+							"SAFE",
+							"LATEST",
+							"PENDING"
+						]
+					}
+				}
+			},
+			"NodeInfoResult": {
+				"type": "object",
+				"properties": {
+					"data": {
+						"$ref": "#/components/schemas/NodeInfo"
+					}
+				}
+			},
 			"NodeVersionResult": {
 				"type": "object",
 				"properties": {
@@ -2196,6 +2655,12 @@
 				"format": "hex-uint64",
 				"pattern": "^0x[a-fA-F0-9]{1,16}$"
 			},
+			"UnsignedInteger256": {
+				"type": "string",
+				"format": "hex-uint256",
+				"pattern": "^0x[a-fA-F0-9]{1,64}$",
+				"description": "256-bit unsigned integer, hex encoded (the node emits minimal hex)"
+			},
 			"FunctionSelector": {
 				"type": "string",
 				"format": "hex-byte",
@@ -2521,48 +2986,60 @@
 				"code": -32603,
 				"message": "Internal server error"
 			},
+			"TimeoutError": {
+				"code": -32070,
+				"message": "Request timed out"
+			},
+			"ResponseSizeLimitExceeded": {
+				"code": -31003,
+				"message": "Response size limit exceeded"
+			},
+			"BatchListItemLimitExceeded": {
+				"code": -31004,
+				"message": "Batch list item limit exceeded"
+			},
 			"ApplicationNotFound": {
-				"code": -32002,
+				"code": -31002,
 				"message": "Application not found"
 			},
 			"EpochNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Epoch not found"
 			},
 			"InputNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Input not found"
 			},
 			"OutputNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Output not found"
 			},
 			"ReportNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Report not found"
 			},
 			"WithdrawalNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Withdrawal not found"
 			},
 			"TournamentNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Tournament not found"
 			},
 			"CommitmentNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Commitment not found"
 			},
 			"MatchNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Match not found"
 			},
 			"MatchAdvancedNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "Match advanced not found"
 			},
 			"NodeConfigNotFound": {
-				"code": -32001,
+				"code": -31001,
 				"message": "EVM Reader config not found"
 			}
 		}
diff --git a/internal/jsonrpc/jsonrpc.go b/internal/jsonrpc/jsonrpc.go
index 71ffc07d9..93c7546bb 100644
--- a/internal/jsonrpc/jsonrpc.go
+++ b/internal/jsonrpc/jsonrpc.go
@@ -4,12 +4,18 @@
 package jsonrpc
 
 import (
+	"bytes"
+	"context"
 	"embed"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"net/http"
+	"reflect"
+	"runtime/debug"
+	"unicode/utf8"
 
 	"github.com/cartesi/rollups-node/internal/config"
 	"github.com/cartesi/rollups-node/internal/evmreader"
@@ -25,65 +31,290 @@ var discoverSpec embed.FS
 const (
 	// Maximum allowed body size (1 MB).
 	MAX_BODY_SIZE = 1 << 20 //nolint: revive
+	// Maximum response size for a single request or cumulative response size for
+	// all entries in a batch (10 MB).
+	MAX_RESPONSE_SIZE = 10 << 20 //nolint: revive
+	// Maximum amount of request in a batch (100)
+	MAX_BATCH_SIZE = 100 //nolint: revive
 	// Maximum amount of items to list (10,000).
 	LIST_ITEM_LIMIT = 10000 //nolint: revive
 	// Default amount of item on a list (50)
 	LIST_ITEM_DEFAULT = 50 //nolint: revive
+	// Maximum number of bytes from an RPC method included in a log record.
+	MAX_LOGGED_METHOD_LEN = 64 //nolint: revive
 )
 
 const (
+	// JSON-RPC  Standard Error Codes (https://json-rpc.dev/docs/reference/error-codes)
+	JSONRPC_PARSE_ERROR      int = -32700 //nolint: revive
+	JSONRPC_INVALID_REQUEST  int = -32600 //nolint: revive
+	JSONRPC_METHOD_NOT_FOUND int = -32601 //nolint: revive
+	JSONRPC_INVALID_PARAMS   int = -32602 //nolint: revive
+	JSONRPC_INTERNAL_ERROR   int = -32603 //nolint: revive
+	JSONRPC_INVALID_BATCH    int = -32040 //nolint: revive
+	JSONRPC_TIMEOUT_ERROR    int = -32070 //nolint: revive
+
 	// Resource not found: the requested resource does not exist in the method's
 	// scope. For application-scoped methods, this means the application exists
 	// but the requested entity does not; unknown applications use
 	// JSONRPC_APPLICATION_NOT_FOUND. For forward-looking keys, this can be the
 	// "not created yet" signal and may be safe to poll depending on the method.
-	JSONRPC_RESOURCE_NOT_FOUND int = -32001 //nolint: revive
+	JSONRPC_RESOURCE_NOT_FOUND int = -31001 //nolint: revive
 	// Application not found: the application identifier itself is unknown to
 	// this node. A configuration error that will not resolve by retrying.
-	JSONRPC_APPLICATION_NOT_FOUND int = -32002 //nolint: revive
-	JSONRPC_PARSE_ERROR           int = -32700 //nolint: revive
-	JSONRPC_INVALID_REQUEST       int = -32600 //nolint: revive
-	JSONRPC_METHOD_NOT_FOUND      int = -32601 //nolint: revive
-	JSONRPC_INVALID_PARAMS        int = -32602 //nolint: revive
-	JSONRPC_INTERNAL_ERROR        int = -32603 //nolint: revive
+	JSONRPC_APPLICATION_NOT_FOUND int = -31002 //nolint: revive
+	// Response size limit exceeded: the buffered-response budget was not enough
+	// for a single response or all responses in a batch.
+	JSONRPC_RESPONSE_SIZE_LIMIT_EXCEEDED int = -31003 //nolint: revive
+	// Batch list item limit exceeded: the cumulative effective list limits in a
+	// batch exceed the work budget allowed to one HTTP request.
+	JSONRPC_BATCH_LIST_ITEM_LIMIT_EXCEEDED int = -31004 //nolint: revive
 )
 
-type rpcHandler = func(*Service, http.ResponseWriter, *http.Request, RPCRequest)
+type rpcHandler = func(*Service, *http.Request, RPCRequest) (any, error)
 type dispatchTable = map[string]rpcHandler
 
+func cloneDispatchTable(source dispatchTable) dispatchTable {
+	clone := make(dispatchTable, len(source))
+	for method, handler := range source {
+		clone[method] = handler
+	}
+	return clone
+}
+
 var jsonrpcHandlers = dispatchTable{
-	"rpc.discover":                      handleDiscover,
-	"cartesi_listApplications":          handleListApplications,
-	"cartesi_getApplication":            handleGetApplication,
-	"cartesi_listEpochs":                handleListEpochs,
-	"cartesi_getEpoch":                  handleGetEpoch,
-	"cartesi_getLastAcceptedEpochIndex": handleGetLastAcceptedEpochIndex,
-	"cartesi_listInputs":                handleListInputs,
-	"cartesi_getInput":                  handleGetInput,
-	"cartesi_getProcessedInputCount":    handleGetProcessedInputCount,
-	"cartesi_listOutputs":               handleListOutputs,
-	"cartesi_getOutput":                 handleGetOutput,
-	"cartesi_listReports":               handleListReports,
-	"cartesi_getReport":                 handleGetReport,
-	"cartesi_listWithdrawals":           handleListWithdrawals,
-	"cartesi_getWithdrawal":             handleGetWithdrawal,
-	"cartesi_listTournaments":           handleListTournaments,
-	"cartesi_getTournament":             handleGetTournament,
-	"cartesi_listCommitments":           handleListCommitments,
-	"cartesi_getCommitment":             handleGetCommitment,
-	"cartesi_listMatches":               handleListMatches,
-	"cartesi_getMatch":                  handleGetMatch,
-	"cartesi_listMatchAdvances":         handleListMatchAdvances,
-	"cartesi_getMatchAdvanced":          handleGetMatchAdvanced,
-	"cartesi_getChainId":                handleGetChainID,
-	"cartesi_getNodeVersion":            handleGetNodeVersion,
+	"rpc.discover":                            handleDiscover,
+	"cartesi_listApplications":                handleListApplications,
+	"cartesi_getApplication":                  handleGetApplication,
+	"cartesi_listEpochs":                      handleListEpochs,
+	"cartesi_getEpoch":                        handleGetEpoch,
+	"cartesi_getEpochByVirtualIndex":          handleGetEpochByVirtualIndex,
+	"cartesi_getLastAcceptedEpochIndex":       handleGetLastAcceptedEpochIndex,
+	"cartesi_listInputs":                      handleListInputs,
+	"cartesi_getInput":                        handleGetInput,
+	"cartesi_getProcessedInputCount":          handleGetProcessedInputCount,
+	"cartesi_getExecutedOutputCount":          handleGetExecutedOutputCount,
+	"cartesi_getPendingExecutableOutputCount": handleGetPendingExecutableOutputCount,
+	"cartesi_listOutputs":                     handleListOutputs,
+	"cartesi_getOutput":                       handleGetOutput,
+	"cartesi_listReports":                     handleListReports,
+	"cartesi_getReport":                       handleGetReport,
+	"cartesi_listWithdrawals":                 handleListWithdrawals,
+	"cartesi_getWithdrawal":                   handleGetWithdrawal,
+	"cartesi_listTournaments":                 handleListTournaments,
+	"cartesi_getTournament":                   handleGetTournament,
+	"cartesi_listCommitments":                 handleListCommitments,
+	"cartesi_getCommitment":                   handleGetCommitment,
+	"cartesi_listMatches":                     handleListMatches,
+	"cartesi_getMatch":                        handleGetMatch,
+	"cartesi_listMatchAdvances":               handleListMatchAdvances,
+	"cartesi_getMatchAdvance":                 handleGetMatchAdvance,
+	"cartesi_getNodeInfo":                     handleGetNodeInfo,
+	"cartesi_getChainId":                      handleGetChainID,
+	"cartesi_getNodeVersion":                  handleGetNodeVersion,
+}
+
+var listParamsTypes = map[string]reflect.Type{
+	"cartesi_listApplications":  reflect.TypeOf(api.ListApplicationsParams{}),
+	"cartesi_listEpochs":        reflect.TypeOf(api.ListEpochsParams{}),
+	"cartesi_listInputs":        reflect.TypeOf(api.ListInputsParams{}),
+	"cartesi_listOutputs":       reflect.TypeOf(api.ListOutputsParams{}),
+	"cartesi_listReports":       reflect.TypeOf(api.ListReportsParams{}),
+	"cartesi_listWithdrawals":   reflect.TypeOf(api.ListWithdrawalsParams{}),
+	"cartesi_listTournaments":   reflect.TypeOf(api.ListTournamentsParams{}),
+	"cartesi_listCommitments":   reflect.TypeOf(api.ListCommitmentsParams{}),
+	"cartesi_listMatches":       reflect.TypeOf(api.ListMatchesParams{}),
+	"cartesi_listMatchAdvances": reflect.TypeOf(api.ListMatchAdvancesParams{}),
+}
+
+func truncatedMethod(method string) string {
+	if len(method) <= MAX_LOGGED_METHOD_LEN {
+		return method
+	}
+	method = method[:MAX_LOGGED_METHOD_LEN]
+	for !utf8.ValidString(method) {
+		method = method[:len(method)-1]
+	}
+	return method + "…(truncated)"
+}
+
+// batchExceedsListItemLimit reports whether the sum of the effective limits of
+// valid list entries exceeds the amount of row-fetch work allowed to one HTTP
+// request. It performs no handler or repository work.
+//
+// Entries that cannot be decoded are left for normal dispatch, which returns
+// their appropriate JSON-RPC error without accessing the repository. Each
+// decodable limit is normalized exactly as it is by the list handlers: zero
+// selects the default and values above the per-list maximum are capped.
+func batchExceedsListItemLimit(requests []json.RawMessage) bool {
+	var total uint64
+	for _, rawRequest := range requests {
+		var request RPCRequest
+		if err := json.Unmarshal(rawRequest, &request); err != nil || request.JSONRPC != "2.0" {
+			continue
+		}
+
+		paramsType, ok := listParamsTypes[request.Method]
+		if !ok {
+			continue
+		}
+		params := reflect.New(paramsType)
+		if err := api.UnmarshalParams(request.Params, params.Interface()); err != nil {
+			continue
+		}
+
+		limitField := params.Elem().FieldByName("Limit")
+		if !limitField.IsValid() || limitField.Kind() != reflect.Uint64 {
+			return true
+		}
+		limit := limitField.Uint()
+		switch {
+		case limit == 0:
+			limit = LIST_ITEM_DEFAULT
+		case limit > LIST_ITEM_LIMIT:
+			limit = LIST_ITEM_LIMIT
+		}
+		total += limit
+		if total > LIST_ITEM_LIMIT {
+			return true
+		}
+	}
+	return false
 }
 
 // -----------------------------------------------------------------------------
 // Dispatching JSON‑RPC methods
 // -----------------------------------------------------------------------------
 
+func (s *Service) handleWriteResponse(err error) bool {
+	if err == nil {
+		return true
+	}
+	s.Logger.Warn("failed writing response", "error", err)
+	return false
+}
+
+func (s *Service) writeByte(w http.ResponseWriter, c byte) bool {
+	_, err := w.Write([]byte{c})
+	return s.handleWriteResponse(err)
+}
+
+// writeRPCError sends a generic error response for internal errors.
+func (s *Service) writeRPCError(w http.ResponseWriter, id json.RawMessage, code int, message string) bool {
+	err := writeRPCError(w, id, code, message)
+	return s.handleWriteResponse(err)
+}
+
+func (s *Service) repositoryError(ctx context.Context, message string, err error) error {
+	if errors.Is(err, context.Canceled) {
+		return err
+	}
+	if errors.Is(err, context.DeadlineExceeded) && errors.Is(ctx.Err(), context.DeadlineExceeded) {
+		return err
+	}
+	s.Logger.Error(message, "err", err)
+	return newRPCError(JSONRPC_INTERNAL_ERROR, "Internal server error")
+}
+
+func (s *Service) handleRequest(w io.Writer, r *http.Request, req RPCRequest) error {
+	if !validRPCID(req.ID) {
+		return writeRPCError(w, nil, JSONRPC_INVALID_REQUEST, "Invalid request ID")
+	}
+	if req.JSONRPC != "2.0" {
+		return writeRPCError(w, req.ID, JSONRPC_INVALID_REQUEST, "Unsupported JSON-RPC version")
+	}
+	if req.Method == "" {
+		return writeRPCError(w, req.ID, JSONRPC_INVALID_REQUEST, "Invalid Request")
+	}
+	fn, ok := s.handlers[req.Method]
+	if !ok {
+		s.Logger.Debug("RPC method not found", "method", truncatedMethod(req.Method))
+		return writeRPCError(w, req.ID, JSONRPC_METHOD_NOT_FOUND, "Method not found")
+	}
+	result, err := fn(s, r, req)
+	if err == nil {
+		return writeRPCResult(w, req.ID, result)
+	}
+	if errors.Is(err, context.Canceled) {
+		return err
+	}
+	if errors.Is(err, context.DeadlineExceeded) && errors.Is(r.Context().Err(), context.DeadlineExceeded) {
+		s.Logger.Warn("RPC method dispatch timeout", "method", truncatedMethod(req.Method))
+		return writeRPCError(w, req.ID, JSONRPC_TIMEOUT_ERROR, "Request timed out")
+	}
+
+	var rpcErr *RPCError
+	if errors.As(err, &rpcErr) {
+		// RPC errors describe expected client-facing failures. Do not log them at
+		// error level; unexpected failures are logged below before being hidden.
+		return writeRPCError(w, req.ID, rpcErr.Code, rpcErr.Message)
+	}
+
+	s.Logger.Error("RPC method failed", "method", truncatedMethod(req.Method), "error", err)
+	return writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error")
+}
+
+func validRPCID(id json.RawMessage) bool {
+	id = bytes.TrimSpace(id)
+	if len(id) == 0 || bytes.Equal(id, []byte("null")) {
+		return true
+	}
+	if id[0] == '"' {
+		var value string
+		return json.Unmarshal(id, &value) == nil
+	}
+	if (id[0] >= '0' && id[0] <= '9') || id[0] == '-' {
+		var number json.Number
+		return json.Unmarshal(id, &number) == nil
+	}
+	return false
+}
+
+func (s *Service) dispatchOneRequest(
+	w http.ResponseWriter,
+	r *http.Request,
+	req RPCRequest,
+	budgetResp *budgetWriter,
+) (responded bool) {
+	defer func() {
+		if recovered := recover(); recovered != nil {
+			if recovered == http.ErrAbortHandler {
+				panic(recovered)
+			}
+			s.Logger.Error("RPC method panic",
+				"method", truncatedMethod(req.Method),
+				"panic", recovered,
+				"stack", string(debug.Stack()),
+			)
+			responded = s.writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error")
+		}
+	}()
+
+	buffer := budgetResp.NewLimitedWriter()
+	if buffer == nil {
+		return s.writeRPCError(w, req.ID, JSONRPC_RESPONSE_SIZE_LIMIT_EXCEEDED, "Response size limit exceeded")
+	}
+	err := s.handleRequest(buffer, r, req)
+	switch {
+	case err == nil:
+		return s.handleWriteResponse(buffer.Flush())
+	case errors.Is(err, context.Canceled):
+		return false
+	case errors.Is(err, io.ErrShortBuffer):
+		return s.writeRPCError(w, req.ID, JSONRPC_RESPONSE_SIZE_LIMIT_EXCEEDED, "Response size limit exceeded")
+	default:
+		s.Logger.Error("RPC method response encode failed", "method", truncatedMethod(req.Method), "error", err)
+		return s.writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error")
+	}
+}
+
 func (s *Service) handleRPC(w http.ResponseWriter, r *http.Request) {
+	if s.dispatchTimeout > 0 {
+		ctx, cancel := context.WithTimeout(r.Context(), s.dispatchTimeout)
+		defer cancel()
+		r = r.WithContext(ctx)
+	}
+
 	// Limit request body size and ensure it is closed.
 	r.Body = http.MaxBytesReader(w, r.Body, MAX_BODY_SIZE)
 	defer r.Body.Close()
@@ -97,17 +328,91 @@ func (s *Service) handleRPC(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Failed to read request body", http.StatusBadRequest)
 		return
 	}
-	var req RPCRequest
-	if err := json.Unmarshal(body, &req); err != nil {
-		http.Error(w, "Invalid JSON", http.StatusBadRequest)
+
+	body = bytes.TrimSpace(body)
+	if len(body) == 0 {
+		http.Error(w, "Empty request body", http.StatusBadRequest)
 		return
 	}
-	s.Logger.Info(fmt.Sprintf("Received RPC request: %s", req.Method))
-	if fn, ok := jsonrpcHandlers[req.Method]; ok {
-		fn(s, w, r, req)
-	} else {
-		s.Logger.Info(fmt.Sprintf("RPC method not found: %s", req.Method))
-		writeRPCError(w, req.ID, JSONRPC_METHOD_NOT_FOUND, "Method not found", nil)
+
+	budgetResp := newBudgetWriter(w, MAX_RESPONSE_SIZE)
+	w.Header().Set("Content-Type", "application/json")
+
+	switch body[0] {
+	case '{':
+		var req RPCRequest
+		if err := json.Unmarshal(body, &req); err != nil {
+			s.writeRPCError(w, nil, JSONRPC_PARSE_ERROR, "Parse error")
+			return
+		}
+		s.Logger.Info("Dispatching RPC request", "method", truncatedMethod(req.Method))
+		s.dispatchOneRequest(w, r, req, budgetResp)
+
+	case '[':
+		// Keep each batch element raw so malformed requests fail independently and
+		// the list-item limit can be checked before dispatching any request.
+		var reqSeq []json.RawMessage
+		if err := json.Unmarshal(body, &reqSeq); err != nil {
+			s.writeRPCError(w, nil, JSONRPC_PARSE_ERROR, "Parse error")
+			return
+		}
+		if len(reqSeq) == 0 || len(reqSeq) > MAX_BATCH_SIZE {
+			s.writeRPCError(w, nil, JSONRPC_INVALID_BATCH, fmt.Sprintf("invalid request batch size (expected [1..%v])", MAX_BATCH_SIZE))
+			return
+		}
+		if batchExceedsListItemLimit(reqSeq) {
+			s.writeRPCError(w, nil, JSONRPC_BATCH_LIST_ITEM_LIMIT_EXCEEDED, "Batch list item limit exceeded")
+			return
+		}
+
+		s.Logger.Info("Received RPC request batch", "items", len(reqSeq))
+		if !s.writeByte(w, '[') {
+			return
+		}
+
+		for i, rawReq := range reqSeq {
+
+			if i > 0 && !s.writeByte(w, ',') {
+				return
+			}
+
+			var responded bool
+			var req RPCRequest
+
+			switch r.Context().Err() {
+			case context.Canceled:
+				return
+			case context.DeadlineExceeded:
+				s.Logger.Warn("RPC method dispatch timeout")
+				if err := json.Unmarshal(rawReq, &req); err != nil {
+					responded = s.writeRPCError(w, nil, JSONRPC_INVALID_REQUEST, "Invalid Request")
+				} else if !validRPCID(req.ID) {
+					responded = s.writeRPCError(w, nil, JSONRPC_INVALID_REQUEST, "Invalid request ID")
+				} else {
+					responded = s.writeRPCError(w, req.ID, JSONRPC_TIMEOUT_ERROR, "Request timed out")
+				}
+			default:
+				if err := json.Unmarshal(rawReq, &req); err != nil {
+					responded = s.writeRPCError(w, nil, JSONRPC_INVALID_REQUEST, "Invalid Request")
+				} else {
+					s.Logger.Debug("Dispatching RPC request", "method", truncatedMethod(req.Method))
+					responded = s.dispatchOneRequest(w, r, req, budgetResp)
+				}
+			}
+
+			if !responded {
+				return
+			}
+		}
+		s.writeByte(w, ']')
+
+	default:
+		if json.Valid(body) {
+			s.writeRPCError(w, nil, JSONRPC_INVALID_REQUEST, "Invalid Request")
+		} else {
+			s.writeRPCError(w, nil, JSONRPC_PARSE_ERROR, "Parse error")
+		}
+
 	}
 }
 
@@ -116,28 +421,18 @@ func (s *Service) handleRPC(w http.ResponseWriter, r *http.Request) {
 // -----------------------------------------------------------------------------
 
 // Discovery: return the embedded specification.
-func handleDiscover(s *Service, w http.ResponseWriter, _ *http.Request, req RPCRequest) {
-	data, err := discoverSpec.ReadFile("jsonrpc-discover.json")
-	if err != nil {
-		s.Logger.Error("Unable to read jsonrpc-discover content", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
-	}
-	var spec any
-	if err := json.Unmarshal(data, &spec); err != nil {
-		s.Logger.Error("Unable to unmarshal discovery spec JSON", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
-	}
-	writeRPCResult(w, req.ID, spec)
+func handleDiscover(s *Service, _ *http.Request, _ RPCRequest) (any, error) {
+	return s.discoverSpec, nil
 }
 
-func handleListApplications(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListApplications(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListApplicationsParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 	// Use default values if not provided
 	if params.Limit <= 0 {
@@ -153,58 +448,53 @@ func handleListApplications(s *Service, w http.ResponseWriter, r *http.Request,
 		Offset: params.Offset,
 	}, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve applications from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve applications from repository", err)
 	}
 	if apps == nil {
 		apps = []*model.Application{}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*model.Application]{
+	return api.ListResponse[*model.Application]{
 		Data: apps,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetApplication(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetApplication(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetApplicationParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	app, err := s.repository.GetApplication(r.Context(), params.Application)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve application from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve application from repository", err)
 	}
 	if app == nil {
-		writeRPCError(w, req.ID, JSONRPC_APPLICATION_NOT_FOUND, "Application not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_APPLICATION_NOT_FOUND, "Application not found")
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*model.Application]{Data: app})
+	return api.SingleResponse[*model.Application]{Data: app}, nil
 }
 
-func handleListEpochs(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListEpochs(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListEpochsParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	// Use default values if not provided
@@ -218,18 +508,28 @@ func handleListEpochs(s *Service, w http.ResponseWriter, r *http.Request, req RP
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	var epochFilter repository.EpochFilter
+	indexRange, err := parseIndexRange(params.From, params.To)
+	if err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, err.Error())
+	}
+	epochFilter.IndexRange = indexRange
 	if params.Status != nil {
-		var status model.EpochStatus
-		if err := status.Scan(*params.Status); err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch status: %v", err), nil)
-			return
+		if len(*params.Status) == 0 {
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid epoch status: expected at least one status")
+		}
+		statuses := make([]model.EpochStatus, 0, len(*params.Status))
+		for _, value := range *params.Status {
+			var status model.EpochStatus
+			if err := status.Scan(value); err != nil {
+				return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch status: %v", err))
+			}
+			statuses = append(statuses, status)
 		}
-		epochFilter.Status = []model.EpochStatus{status}
+		epochFilter.Status = statuses
 	}
 
 	epochs, total, err := s.repository.ListEpochs(r.Context(), params.Application, epochFilter, repository.Pagination{
@@ -237,102 +537,149 @@ func handleListEpochs(s *Service, w http.ResponseWriter, r *http.Request, req RP
 		Offset: params.Offset,
 	}, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve epochs from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve epochs from repository", err)
 	}
 
-	if len(epochs) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+	if len(epochs) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
 	}
 	if epochs == nil {
 		epochs = []*model.Epoch{}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*model.Epoch]{
+	return api.ListResponse[*model.Epoch]{
 		Data: epochs,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetEpoch(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetEpoch(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetEpochParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	index, err := config.ToIndexFromString(params.EpochIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 	}
 
 	epoch, err := s.repository.GetEpoch(r.Context(), params.Application, index)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve epoch from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve epoch from repository", err)
 	}
 	if epoch == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Epoch not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Epoch not found")
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*model.Epoch]{Data: epoch})
+	return api.SingleResponse[*model.Epoch]{Data: epoch}, nil
 }
 
-func handleGetLastAcceptedEpochIndex(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetEpochByVirtualIndex(s *Service, r *http.Request, req RPCRequest) (any, error) {
+	var params api.GetEpochByVirtualIndexParams
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
+		s.Logger.Debug("Invalid parameters", "err", err)
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+
+	// Validate application parameter
+	if err := validateNameOrAddress(params.Application); err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
+	}
+
+	index, err := config.ToIndexFromString(params.VirtualIndex)
+	if err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid virtual index: %v", err))
+	}
+
+	epoch, err := s.repository.GetEpochByVirtualIndex(r.Context(), params.Application, index)
+	if err != nil {
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve epoch from repository", err)
+	}
+	if epoch == nil {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Epoch not found")
+	}
+
+	return api.SingleResponse[*model.Epoch]{Data: epoch}, nil
+}
+
+func handleGetLastAcceptedEpochIndex(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetLastAcceptedEpochIndexParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	index, err := s.repository.GetLastAcceptedEpochIndex(r.Context(), params.Application)
 	if errors.Is(err, repository.ErrNotFound) {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Epoch not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Epoch not found")
 	}
 	if err != nil {
-		s.Logger.Error("Unable to retrieve epoch from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve epoch from repository", err)
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[string]{Data: fmt.Sprintf("0x%x", index)})
+	return api.SingleResponse[string]{Data: fmt.Sprintf("0x%x", index)}, nil
 }
 
-func handleListInputs(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func (s *Service) decodeInputs(application string, inputs []*model.Input) []*api.DecodedInput {
+	result := make([]*api.DecodedInput, 0, len(inputs))
+	failureCount := 0
+	var firstFailingIndex uint64
+	for _, input := range inputs {
+		decoded, err := api.DecodeInput(input, s.inputABI)
+		if err != nil {
+			if failureCount == 0 {
+				firstFailingIndex = input.Index
+			}
+			failureCount++
+			s.Logger.Debug("Unable to decode Input", "app", application, "index", input.Index, "err", err)
+		}
+		result = append(result, decoded)
+	}
+	if failureCount > 0 {
+		s.Logger.Warn("Unable to decode Inputs",
+			"app", application,
+			"count", failureCount,
+			"first_index", firstFailingIndex,
+		)
+	}
+	return result
+}
+
+func handleListInputs(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListInputsParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	// Use default values if not provided
@@ -346,17 +693,20 @@ func handleListInputs(s *Service, w http.ResponseWriter, r *http.Request, req RP
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	// Create input filter based on params
 	inputFilter := repository.InputFilter{}
+	indexRange, err := parseIndexRange(params.From, params.To)
+	if err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, err.Error())
+	}
+	inputFilter.IndexRange = indexRange
 	if params.EpochIndex != nil {
 		epochIndex, err := config.ToIndexFromString(*params.EpochIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 		}
 		inputFilter.EpochIndex = &epochIndex
 	}
@@ -365,16 +715,14 @@ func handleListInputs(s *Service, w http.ResponseWriter, r *http.Request, req RP
 	if params.Sender != nil {
 		sender, err := config.ToAddressFromString(*params.Sender)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid input sender address: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid input sender address: %v", err))
 		}
 		inputFilter.Sender = &sender
 	}
 	if params.TransactionHash != nil {
 		transactionHash, err := config.ToHashFromString(*params.TransactionHash)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid transaction hash: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid transaction hash: %v", err))
 		}
 		inputFilter.TransactionHash = &transactionHash
 	}
@@ -384,109 +732,163 @@ func handleListInputs(s *Service, w http.ResponseWriter, r *http.Request, req RP
 		Offset: params.Offset,
 	}, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve inputs from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
-	}
-	if len(inputs) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve inputs from repository", err)
 	}
-
-	resultInputs := make([]*api.DecodedInput, 0, len(inputs))
-	for _, in := range inputs {
-		decoded, err := api.DecodeInput(in, s.inputABI)
-		if err != nil {
-			s.Logger.Error("Unable to decode Input", "app", params.Application, "index", in.Index, "err", err)
+	if len(inputs) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		resultInputs = append(resultInputs, decoded)
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*api.DecodedInput]{
+	resultInputs := s.decodeInputs(params.Application, inputs)
+
+	return api.ListResponse[*api.DecodedInput]{
 		Data: resultInputs,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetInput(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetInput(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetInputParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	index, err := config.ToIndexFromString(params.InputIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid input index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid input index: %v", err))
 	}
 
 	input, err := s.repository.GetInput(r.Context(), params.Application, index)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve input from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve input from repository", err)
 	}
 	if input == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Input not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Input not found")
 	}
 
-	decoded, err := api.DecodeInput(input, s.inputABI)
-	if err != nil {
-		s.Logger.Error("Unable to decode Input", "app", params.Application, "index", input.Index, "err", err)
-	}
+	decoded := s.decodeInputs(params.Application, []*model.Input{input})[0]
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*api.DecodedInput]{Data: decoded})
+	return api.SingleResponse[*api.DecodedInput]{Data: decoded}, nil
 }
 
-func handleGetProcessedInputCount(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetProcessedInputCount(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetApplicationParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	processedInputs, err := s.repository.GetProcessedInputCount(r.Context(), params.Application)
 	if errors.Is(err, repository.ErrNotFound) {
-		writeRPCError(w, req.ID, JSONRPC_APPLICATION_NOT_FOUND, "Application not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_APPLICATION_NOT_FOUND, "Application not found")
 	}
 	if err != nil {
-		s.Logger.Error("Unable to retrieve application from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve application from repository", err)
+	}
+
+	return api.SingleResponse[string]{Data: fmt.Sprintf("0x%x", processedInputs)}, nil
+}
+
+func handleGetExecutedOutputCount(s *Service, r *http.Request, req RPCRequest) (any, error) {
+	var params api.GetApplicationParams
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
+		s.Logger.Debug("Invalid parameters", "err", err)
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+
+	if err := validateNameOrAddress(params.Application); err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
+	}
+
+	count, err := s.repository.GetNumberOfExecutedOutputs(r.Context(), params.Application)
+	if err != nil {
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve executed output count from repository", err)
+	}
+	if count == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
+	}
+
+	return api.SingleResponse[string]{Data: fmt.Sprintf("0x%x", count)}, nil
+}
+
+func handleGetPendingExecutableOutputCount(s *Service, r *http.Request, req RPCRequest) (any, error) {
+	var params api.GetApplicationParams
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
+		s.Logger.Debug("Invalid parameters", "err", err)
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+
+	if err := validateNameOrAddress(params.Application); err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[string]{Data: fmt.Sprintf("0x%x", processedInputs)})
+	count, err := s.repository.GetNumberOfPendingExecutableOutputs(r.Context(), params.Application)
+	if err != nil {
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve pending executable output count from repository", err)
+	}
+	if count == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
+	}
+
+	return api.SingleResponse[string]{Data: fmt.Sprintf("0x%x", count)}, nil
+}
+
+func (s *Service) decodeOutputs(application string, outputs []*model.Output) []*api.DecodedOutput {
+	result := make([]*api.DecodedOutput, 0, len(outputs))
+	failureCount := 0
+	var firstFailingIndex uint64
+	for _, output := range outputs {
+		decoded, err := api.DecodeOutput(output, s.outputABI)
+		if err != nil {
+			if failureCount == 0 {
+				firstFailingIndex = output.Index
+			}
+			failureCount++
+			s.Logger.Debug("Unable to decode Output", "app", application, "index", output.Index, "err", err)
+		}
+		result = append(result, decoded)
+	}
+	if failureCount > 0 {
+		s.Logger.Warn("Unable to decode Outputs",
+			"app", application,
+			"count", failureCount,
+			"first_index", firstFailingIndex,
+		)
+	}
+	return result
 }
 
-func handleListOutputs(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListOutputs(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListOutputsParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	// Use default values if not provided
@@ -500,17 +902,20 @@ func handleListOutputs(s *Service, w http.ResponseWriter, r *http.Request, req R
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	// Create output filter based on params
 	outputFilter := repository.OutputFilter{}
+	indexRange, err := parseIndexRange(params.From, params.To)
+	if err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, err.Error())
+	}
+	outputFilter.IndexRange = indexRange
 	if params.EpochIndex != nil {
 		epochIndex, err := config.ToIndexFromString(*params.EpochIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 		}
 		outputFilter.EpochIndex = &epochIndex
 	}
@@ -518,28 +923,33 @@ func handleListOutputs(s *Service, w http.ResponseWriter, r *http.Request, req R
 	if params.InputIndex != nil {
 		inputIndex, err := config.ToIndexFromString(*params.InputIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid input index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid input index: %v", err))
 		}
 		outputFilter.InputIndex = &inputIndex
 	}
 
 	// Add output type filter if provided
 	if params.OutputType != nil {
-		outputType, err := api.ParseOutputType(*params.OutputType)
-		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid output type: %v", err), nil)
-			return
+		if len(*params.OutputType) == 0 {
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid output type: expected at least one selector")
+		}
+		outputTypes := make([][]byte, 0, len(*params.OutputType))
+		for _, selector := range *params.OutputType {
+			outputType, err := api.ParseOutputType(selector)
+			if err != nil {
+				return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid output type: %v", err))
+			}
+			outputTypes = append(outputTypes, outputType)
 		}
-		outputFilter.OutputType = &outputType
+		outputFilter.OutputType = &outputTypes
 	}
+	outputFilter.Executed = params.Executed
 
 	// Add sender filter if provided
 	if params.VoucherAddress != nil {
 		voucherAddress, err := config.ToAddressFromString(*params.VoucherAddress)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid voucher address: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid voucher address: %v", err))
 		}
 		outputFilter.VoucherAddress = &voucherAddress
 	}
@@ -549,82 +959,68 @@ func handleListOutputs(s *Service, w http.ResponseWriter, r *http.Request, req R
 		Offset: params.Offset,
 	}, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve outputs from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve outputs from repository", err)
 	}
 
-	resultOutputs := make([]*api.DecodedOutput, 0, len(outputs))
-	for _, out := range outputs {
-		decoded, err := api.DecodeOutput(out, s.outputABI)
-		if err != nil {
-			s.Logger.Error("Unable to decode Output", "app", params.Application, "index", out.Index, "err", err)
-		}
-		resultOutputs = append(resultOutputs, decoded)
-	}
+	resultOutputs := s.decodeOutputs(params.Application, outputs)
 
-	if len(resultOutputs) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+	if len(resultOutputs) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*api.DecodedOutput]{
+	return api.ListResponse[*api.DecodedOutput]{
 		Data: resultOutputs,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetOutput(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetOutput(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetOutputParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	index, err := config.ToIndexFromString(params.OutputIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid output index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid output index: %v", err))
 	}
 
 	output, err := s.repository.GetOutput(r.Context(), params.Application, index)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve output from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve output from repository", err)
 	}
 	if output == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Output not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Output not found")
 	}
 
-	decoded, err := api.DecodeOutput(output, s.outputABI)
-	if err != nil {
-		s.Logger.Error("Unable to decode Output", "app", params.Application, "index", output.Index, "err", err)
-	}
+	decoded := s.decodeOutputs(params.Application, []*model.Output{output})[0]
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*api.DecodedOutput]{Data: decoded})
+	return api.SingleResponse[*api.DecodedOutput]{Data: decoded}, nil
 }
 
-func handleListReports(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListReports(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListReportsParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	// Use default values if not provided
@@ -638,17 +1034,20 @@ func handleListReports(s *Service, w http.ResponseWriter, r *http.Request, req R
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	// Create report filter based on params
 	reportFilter := repository.ReportFilter{}
+	indexRange, err := parseIndexRange(params.From, params.To)
+	if err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, err.Error())
+	}
+	reportFilter.IndexRange = indexRange
 	if params.EpochIndex != nil {
 		epochIndex, err := config.ToIndexFromString(*params.EpochIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 		}
 		reportFilter.EpochIndex = &epochIndex
 	}
@@ -656,8 +1055,7 @@ func handleListReports(s *Service, w http.ResponseWriter, r *http.Request, req R
 	if params.InputIndex != nil {
 		inputIndex, err := config.ToIndexFromString(*params.InputIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid input index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid input index: %v", err))
 		}
 		reportFilter.InputIndex = &inputIndex
 	}
@@ -667,71 +1065,67 @@ func handleListReports(s *Service, w http.ResponseWriter, r *http.Request, req R
 		Offset: params.Offset,
 	}, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve reports from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve reports from repository", err)
 	}
 
-	if len(reports) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+	if len(reports) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
 	}
 	if reports == nil {
 		reports = []*model.Report{}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*model.Report]{
+	return api.ListResponse[*model.Report]{
 		Data: reports,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetReport(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetReport(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetReportParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	index, err := config.ToIndexFromString(params.ReportIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid report index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid report index: %v", err))
 	}
 
 	report, err := s.repository.GetReport(r.Context(), params.Application, index)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve report from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve report from repository", err)
 	}
 	if report == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Report not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Report not found")
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*model.Report]{Data: report})
+	return api.SingleResponse[*model.Report]{Data: report}, nil
 }
 
-func handleListWithdrawals(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListWithdrawals(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListWithdrawalsParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	if params.Limit <= 0 {
@@ -742,16 +1136,14 @@ func handleListWithdrawals(s *Service, w http.ResponseWriter, r *http.Request, r
 	}
 
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	withdrawalFilter := repository.WithdrawalFilter{}
 	if params.AccountIndex != nil {
 		accountIndex, err := config.ToIndexFromString(*params.AccountIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid account index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid account index: %v", err))
 		}
 		withdrawalFilter.AccountIndex = &accountIndex
 	}
@@ -762,70 +1154,66 @@ func handleListWithdrawals(s *Service, w http.ResponseWriter, r *http.Request, r
 		params.Descending,
 	)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve withdrawals from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve withdrawals from repository", err)
 	}
 
-	if len(withdrawals) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+	if len(withdrawals) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
 	}
 	if withdrawals == nil {
 		withdrawals = []*model.Withdrawal{}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*model.Withdrawal]{
+	return api.ListResponse[*model.Withdrawal]{
 		Data: withdrawals,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetWithdrawal(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetWithdrawal(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetWithdrawalParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	accountIndex, err := config.ToIndexFromString(params.AccountIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid account index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid account index: %v", err))
 	}
 
 	withdrawal, err := s.repository.GetWithdrawal(r.Context(), params.Application, accountIndex)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve withdrawal from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve withdrawal from repository", err)
 	}
 	if withdrawal == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Withdrawal not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Withdrawal not found")
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*model.Withdrawal]{Data: withdrawal})
+	return api.SingleResponse[*model.Withdrawal]{Data: withdrawal}, nil
 }
 
-func handleListTournaments(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListTournaments(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListTournamentsParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	// Use default values if not provided
@@ -839,8 +1227,7 @@ func handleListTournaments(s *Service, w http.ResponseWriter, r *http.Request, r
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	// Create tournament filter based on params
@@ -848,8 +1235,7 @@ func handleListTournaments(s *Service, w http.ResponseWriter, r *http.Request, r
 	if params.EpochIndex != nil {
 		epochIndex, err := config.ToIndexFromString(*params.EpochIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 		}
 		tournamentFilter.EpochIndex = &epochIndex
 	}
@@ -857,8 +1243,7 @@ func handleListTournaments(s *Service, w http.ResponseWriter, r *http.Request, r
 	if params.Level != nil {
 		level, err := config.ToIndexFromString(*params.Level)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid level: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid level: %v", err))
 		}
 		tournamentFilter.Level = &level
 	}
@@ -866,8 +1251,7 @@ func handleListTournaments(s *Service, w http.ResponseWriter, r *http.Request, r
 	if params.ParentTournamentAddress != nil {
 		parentAddress, err := config.ToAddressFromString(*params.ParentTournamentAddress)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid parent tournament address: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid parent tournament address: %v", err))
 		}
 		tournamentFilter.ParentTournamentAddress = &parentAddress
 	}
@@ -875,8 +1259,7 @@ func handleListTournaments(s *Service, w http.ResponseWriter, r *http.Request, r
 	if params.ParentMatchIDHash != nil {
 		parentMatchIDHash, err := config.ToHashFromString(*params.ParentMatchIDHash)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid parent match ID hash: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid parent match ID hash: %v", err))
 		}
 		tournamentFilter.ParentMatchIDHash = &parentMatchIDHash
 	}
@@ -886,70 +1269,66 @@ func handleListTournaments(s *Service, w http.ResponseWriter, r *http.Request, r
 		Offset: params.Offset,
 	}, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve tournaments from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve tournaments from repository", err)
 	}
-	if len(tournaments) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+	if len(tournaments) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
 	}
 	if tournaments == nil {
 		tournaments = []*model.Tournament{}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*model.Tournament]{
+	return api.ListResponse[*model.Tournament]{
 		Data: tournaments,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetTournament(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetTournament(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetTournamentParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	// Validate tournament address
 	if _, err := config.ToAddressFromString(params.Address); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err))
 	}
 
 	tournament, err := s.repository.GetTournament(r.Context(), params.Application, params.Address)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve tournament from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve tournament from repository", err)
 	}
 	if tournament == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Tournament not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Tournament not found")
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*model.Tournament]{Data: tournament})
+	return api.SingleResponse[*model.Tournament]{Data: tournament}, nil
 }
 
-func handleListCommitments(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListCommitments(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListCommitmentsParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	// Use default values if not provided
@@ -963,8 +1342,7 @@ func handleListCommitments(s *Service, w http.ResponseWriter, r *http.Request, r
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	// Create commitment filter based on params
@@ -972,16 +1350,14 @@ func handleListCommitments(s *Service, w http.ResponseWriter, r *http.Request, r
 	if params.EpochIndex != nil {
 		epochIndex, err := config.ToIndexFromString(*params.EpochIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 		}
 		commitmentFilter.EpochIndex = &epochIndex
 	}
 
 	if params.TournamentAddress != nil {
 		if _, err := config.ToAddressFromString(*params.TournamentAddress); err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err))
 		}
 		commitmentFilter.TournamentAddress = params.TournamentAddress
 	}
@@ -991,84 +1367,77 @@ func handleListCommitments(s *Service, w http.ResponseWriter, r *http.Request, r
 		Offset: params.Offset,
 	}, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve commitments from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve commitments from repository", err)
 	}
-	if len(commitments) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+	if len(commitments) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
 	}
 	if commitments == nil {
 		commitments = []*model.Commitment{}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*model.Commitment]{
+	return api.ListResponse[*model.Commitment]{
 		Data: commitments,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetCommitment(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetCommitment(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetCommitmentParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	epochIndex, err := config.ToIndexFromString(params.EpochIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 	}
 
 	if _, err := config.ToAddressFromString(params.TournamentAddress); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err))
 	}
 
 	if len(params.Commitment) == 0 {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid commitment hex: Empty string", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid commitment hex: Empty string")
 	}
 	if _, err := config.ToHashFromString(params.Commitment); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid commitment hex: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid commitment hex: %v", err))
 	}
 
 	commitment, err := s.repository.GetCommitment(r.Context(), params.Application, epochIndex, params.TournamentAddress, params.Commitment)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve commitment from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve commitment from repository", err)
 	}
 	if commitment == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Commitment not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Commitment not found")
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*model.Commitment]{Data: commitment})
+	return api.SingleResponse[*model.Commitment]{Data: commitment}, nil
 }
 
-func handleListMatches(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListMatches(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListMatchesParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	// Use default values if not provided
@@ -1082,8 +1451,7 @@ func handleListMatches(s *Service, w http.ResponseWriter, r *http.Request, req R
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	// Create match filter based on params
@@ -1091,16 +1459,14 @@ func handleListMatches(s *Service, w http.ResponseWriter, r *http.Request, req R
 	if params.EpochIndex != nil {
 		epochIndex, err := config.ToIndexFromString(*params.EpochIndex)
 		if err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 		}
 		matchFilter.EpochIndex = &epochIndex
 	}
 
 	if params.TournamentAddress != nil {
 		if _, err := config.ToAddressFromString(*params.TournamentAddress); err != nil {
-			writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err), nil)
-			return
+			return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err))
 		}
 		matchFilter.TournamentAddress = params.TournamentAddress
 	}
@@ -1110,80 +1476,74 @@ func handleListMatches(s *Service, w http.ResponseWriter, r *http.Request, req R
 		Offset: params.Offset,
 	}, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve matches from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve matches from repository", err)
 	}
-	if len(matches) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+	if len(matches) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
 	}
 	if matches == nil {
 		matches = []*model.Match{}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*model.Match]{
+	return api.ListResponse[*model.Match]{
 		Data: matches,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetMatch(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetMatch(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.GetMatchParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	epochIndex, err := config.ToIndexFromString(params.EpochIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 	}
 
 	if _, err := config.ToAddressFromString(params.TournamentAddress); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err))
 	}
 
 	if _, err := config.ToHashFromString(params.IDHash); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid ID hash: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid ID hash: %v", err))
 	}
 
 	match, err := s.repository.GetMatch(r.Context(), params.Application, epochIndex, params.TournamentAddress, params.IDHash)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve match from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve match from repository", err)
 	}
 	if match == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Match not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Match not found")
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*model.Match]{Data: match})
+	return api.SingleResponse[*model.Match]{Data: match}, nil
 }
 
-func handleListMatchAdvances(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleListMatchAdvances(s *Service, r *http.Request, req RPCRequest) (any, error) {
 	var params api.ListMatchAdvancesParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
+	}
+	if params.Offset > math.MaxInt64 {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid offset")
 	}
 
 	// Use default values if not provided
@@ -1197,25 +1557,21 @@ func handleListMatchAdvances(s *Service, w http.ResponseWriter, r *http.Request,
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	// Create match advance filter based on params
 	epochIndex, err := config.ToIndexFromString(params.EpochIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 	}
 
 	if _, err := config.ToAddressFromString(params.TournamentAddress); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err))
 	}
 
 	if _, err := config.ToHashFromString(params.IDHash); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid ID hash: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid ID hash: %v", err))
 	}
 
 	pagination := repository.Pagination{
@@ -1225,113 +1581,139 @@ func handleListMatchAdvances(s *Service, w http.ResponseWriter, r *http.Request,
 	matchAdvances, total, err := s.repository.ListMatchAdvances(r.Context(), params.Application, epochIndex,
 		params.TournamentAddress, params.IDHash, pagination, params.Descending)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve match advances from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve match advances from repository", err)
 	}
-	if len(matchAdvances) == 0 && s.applicationAbsentOrError(w, r, req, params.Application) {
-		return
+	if len(matchAdvances) == 0 {
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
+		}
 	}
 	if matchAdvances == nil {
 		matchAdvances = []*model.MatchAdvanced{}
 	}
 
-	writeRPCResult(w, req.ID, api.ListResponse[*model.MatchAdvanced]{
+	return api.ListResponse[*model.MatchAdvanced]{
 		Data: matchAdvances,
 		Pagination: api.Pagination{
 			TotalCount: total,
 			Limit:      params.Limit,
 			Offset:     params.Offset,
 		},
-	})
+	}, nil
 }
 
-func handleGetMatchAdvanced(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
-	var params api.GetMatchAdvancedParams
-	if err := UnmarshalParams(req.Params, &params); err != nil {
+func handleGetMatchAdvance(s *Service, r *http.Request, req RPCRequest) (any, error) {
+	var params api.GetMatchAdvanceParams
+	if err := api.UnmarshalParams(req.Params, &params); err != nil {
 		s.Logger.Debug("Invalid parameters", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, "Invalid parameters", nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, "Invalid parameters")
 	}
 
 	// Validate application parameter
 	if err := validateNameOrAddress(params.Application); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid application identifier: %v", err))
 	}
 
 	epochIndex, err := config.ToIndexFromString(params.EpochIndex)
 	if err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid epoch index: %v", err))
 	}
 
 	if _, err := config.ToAddressFromString(params.TournamentAddress); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid tournament address: %v", err))
 	}
 
 	if _, err := config.ToHashFromString(params.IDHash); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid ID hash: %v", err), nil)
-		return
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid ID hash: %v", err))
 	}
 
-	if _, err := config.ToHashFromString(params.Parent); err != nil {
-		writeRPCError(w, req.ID, JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid parent hash: %v", err), nil)
-		return
+	parent, err := config.ToHashFromString(params.Parent)
+	if err != nil {
+		return nil, newRPCError(JSONRPC_INVALID_PARAMS, fmt.Sprintf("Invalid parent hash: %v", err))
 	}
 
 	matchAdvanced, err := s.repository.GetMatchAdvanced(r.Context(), params.Application, epochIndex,
-		params.TournamentAddress, params.IDHash, params.Parent[2:]) // TODO: use parsed value
+		params.TournamentAddress, params.IDHash, parent.Hex()[2:])
 	if err != nil {
-		s.Logger.Error("Unable to retrieve match advanced from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve match advanced from repository", err)
 	}
 	if matchAdvanced == nil {
-		if s.applicationAbsentOrError(w, r, req, params.Application) {
-			return
+		if err := s.applicationAbsentOrError(r, params.Application); err != nil {
+			return nil, err
 		}
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "Match advanced not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "Match advanced not found")
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[*model.MatchAdvanced]{Data: matchAdvanced})
+	return api.SingleResponse[*model.MatchAdvanced]{Data: matchAdvanced}, nil
 }
 
-func handleGetChainID(s *Service, w http.ResponseWriter, r *http.Request, req RPCRequest) {
+func handleGetNodeInfo(s *Service, r *http.Request, _ RPCRequest) (any, error) {
+	cfg, err := repository.LoadNodeConfig[evmreader.PersistentConfig](r.Context(), s.repository, evmreader.EvmReaderConfigKey)
+	if errors.Is(err, repository.ErrNotFound) {
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "EVM Reader config not found")
+	}
+	if err != nil {
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve evmreader config from repository", err)
+	}
+
+	return api.SingleResponse[api.NodeInfo]{Data: api.NodeInfo{
+		ChainID:      fmt.Sprintf("0x%x", cfg.Value.ChainID),
+		Version:      version.BuildVersion,
+		DefaultBlock: string(cfg.Value.DefaultBlock), // FINALIZED | SAFE | LATEST | PENDING
+	}}, nil
+}
+
+func handleGetChainID(s *Service, r *http.Request, _ RPCRequest) (any, error) {
 	config, err := repository.LoadNodeConfig[evmreader.PersistentConfig](r.Context(), s.repository, evmreader.EvmReaderConfigKey)
 	if errors.Is(err, repository.ErrNotFound) {
-		writeRPCError(w, req.ID, JSONRPC_RESOURCE_NOT_FOUND, "EVM Reader config not found", nil)
-		return
+		return nil, newRPCError(JSONRPC_RESOURCE_NOT_FOUND, "EVM Reader config not found")
 	}
 	if err != nil {
-		s.Logger.Error("Unable to retrieve evmreader config from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve evmreader config from repository", err)
 	}
 
-	writeRPCResult(w, req.ID, api.SingleResponse[string]{Data: fmt.Sprintf("0x%x", config.Value.ChainID)})
+	return api.SingleResponse[string]{Data: fmt.Sprintf("0x%x", config.Value.ChainID)}, nil
 }
 
-func handleGetNodeVersion(_ *Service, w http.ResponseWriter, _ *http.Request, req RPCRequest) {
-	writeRPCResult(w, req.ID, api.SingleResponse[string]{Data: version.BuildVersion})
+func handleGetNodeVersion(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+	return api.SingleResponse[string]{Data: version.BuildVersion}, nil
+}
+
+func parseIndexRange(from, to *string) (*repository.Range, error) {
+	if from == nil && to == nil {
+		return nil, nil
+	}
+
+	indexRange := repository.Range{End: math.MaxUint64}
+	if from != nil {
+		value, err := config.ToIndexFromString(*from)
+		if err != nil {
+			return nil, fmt.Errorf("invalid from index: %w", err)
+		}
+		indexRange.Start = value
+	}
+	if to != nil {
+		value, err := config.ToIndexFromString(*to)
+		if err != nil {
+			return nil, fmt.Errorf("invalid to index: %w", err)
+		}
+		indexRange.End = value
+	}
+	if indexRange.Start > indexRange.End {
+		return nil, fmt.Errorf("invalid index range: from must be less than or equal to to")
+	}
+	return &indexRange, nil
 }
 
 func (s *Service) applicationAbsentOrError(
-	w http.ResponseWriter,
 	r *http.Request,
-	req RPCRequest,
 	validatedNameOrAddress string,
-) bool {
+) error {
 	app, err := s.repository.GetApplication(r.Context(), validatedNameOrAddress)
 	if err != nil {
-		s.Logger.Error("Unable to retrieve application from repository", "err", err)
-		writeRPCError(w, req.ID, JSONRPC_INTERNAL_ERROR, "Internal server error", nil)
-		return true
+		return s.repositoryError(r.Context(), "Unable to retrieve application from repository", err)
 	} else if app == nil {
-		writeRPCError(w, req.ID, JSONRPC_APPLICATION_NOT_FOUND, "Application not found", nil)
-		return true
+		return newRPCError(JSONRPC_APPLICATION_NOT_FOUND, "Application not found")
 	}
-	return false
+	return nil
 }
diff --git a/internal/jsonrpc/jsonrpc_test.go b/internal/jsonrpc/jsonrpc_test.go
index d4fd906f3..0f65c1836 100644
--- a/internal/jsonrpc/jsonrpc_test.go
+++ b/internal/jsonrpc/jsonrpc_test.go
@@ -16,9 +16,13 @@
 package jsonrpc
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
+	"log/slog"
+	"math"
+	"net/http"
 	"os"
 	"time"
 
@@ -54,7 +58,10 @@ func TestInvalidJSON(t *testing.T) {
 		"id": 0,
 	}`))
 
-	assert.Equal(t, "Invalid JSON\n", string(body))
+	var resp RPCResponse
+	assert.Nil(t, json.Unmarshal(body, &resp))
+	assert.Equal(t, JSONRPC_PARSE_ERROR, resp.Error.Code)
+	assert.Equal(t, "Parse error", resp.Error.Message)
 }
 
 // failure: invalid method
@@ -74,6 +81,28 @@ func TestInvalidMethod(t *testing.T) {
 	assert.Equal(t, "Method not found", resp.Error.Message)
 }
 
+func TestJSONRPCSingleRequestReplacesResponseAtResponseBudget(t *testing.T) {
+	s := newBatchTestService()
+	const method = "test_large_single_result"
+	largeResult := strings.Repeat("x", MAX_RESPONSE_SIZE)
+	var called bool
+	withTestRPCHandler(t, s, method, func(_ *Service, _ *http.Request, _ RPCRequest) (any, error) {
+		called = true
+		return largeResult, nil
+	})
+
+	body := []byte(fmt.Sprintf(
+		`{"jsonrpc":"2.0","method":%q,"params":{"limit":10000},"id":1}`, method))
+	require.Less(t, len(body), 1<<10, "the request cap must not be mistaken for the response cap")
+	rr := serveRPC(t, s, body)
+
+	require.True(t, called, "the request handler must run before its oversized response is replaced")
+	require.Equal(t, http.StatusOK, rr.Code)
+	response := decodeRPCResponse(t, rr.Body.Bytes())
+	requireRPCError(t, response, float64(1), JSONRPC_RESPONSE_SIZE_LIMIT_EXCEEDED)
+	require.Equal(t, "Response size limit exceeded", response.Error.Message)
+}
+
 // tests for jsonrpc methods grouped by method name.
 // At the end we check if all methods ran at least once
 func TestMethod(t *testing.T) {
@@ -159,6 +188,66 @@ func TestMethod(t *testing.T) {
 		})
 	})
 
+	////////////////////////////////////////////////////////////////////////
+	// getNodeInfo
+	////////////////////////////////////////////////////////////////////////
+	t.Run("cartesi_getNodeInfo", func(t *testing.T) {
+		method := getName(t.Name())
+
+		// failure: evm reader not configured -> resource not found
+		t.Run("absent", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+
+			body := s.doRequest(t, 0, []byte(`{
+				"jsonrpc": "2.0",
+				"method": "cartesi_getNodeInfo",
+				"params": {},
+				"id": 0
+			}`))
+
+			resp := testRPCResponse[any]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			require.NotNil(t, resp.Error)
+			assert.Equal(t, JSONRPC_RESOURCE_NOT_FOUND, resp.Error.Code)
+			assert.Equal(t, "EVM Reader config not found", resp.Error.Message)
+		})
+
+		// success: combine persisted node configuration with the build version
+		t.Run("present", func(t *testing.T) {
+			testHistogram.inc(method)
+			ctx := context.Background()
+			s := newTestService(t, t.Name())
+
+			chainID := uint64(0xdeadbeef)
+			defaultBlock := model.DefaultBlock_Safe
+			err := repository.SaveNodeConfig(ctx, s.repository,
+				&model.NodeConfig[evmreader.PersistentConfig]{
+					Key: evmreader.EvmReaderConfigKey,
+					Value: evmreader.PersistentConfig{
+						ChainID:      chainID,
+						DefaultBlock: defaultBlock,
+					},
+				},
+			)
+			require.NoError(t, err)
+
+			body := s.doRequest(t, 0, []byte(`{
+				"jsonrpc": "2.0",
+				"method": "cartesi_getNodeInfo",
+				"params": {},
+				"id": 0
+			}`))
+
+			resp := testRPCResponse[api.NodeInfo]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			require.Nil(t, resp.Error)
+			assert.Equal(t, hexutil.EncodeUint64(chainID), resp.Result.Data.ChainID)
+			assert.Equal(t, version.BuildVersion, resp.Result.Data.Version)
+			assert.Equal(t, string(defaultBlock), resp.Result.Data.DefaultBlock)
+		})
+	})
+
 	////////////////////////////////////////////////////////////////////////
 	// getChainId
 	////////////////////////////////////////////////////////////////////////
@@ -328,6 +417,120 @@ func TestMethod(t *testing.T) {
 		})
 	})
 
+	////////////////////////////////////////////////////////////////////////
+	// getEpochByVirtualIndex
+	////////////////////////////////////////////////////////////////////////
+	t.Run("cartesi_getEpochByVirtualIndex", func(t *testing.T) {
+		method := getName(t.Name())
+
+		// failure: virtual_index not hex encoded -> invalid param
+		t.Run("malformedVirtualIndex", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+
+			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+				"jsonrpc": "2.0",
+				"method": "cartesi_getEpochByVirtualIndex",
+				"params": {
+					"application": "%v",
+					"virtual_index": 0
+				},
+				"id": 0
+			}`, numberToName(1)))
+
+			resp := testRPCResponse[any]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			require.NotNil(t, resp.Error)
+			assert.Equal(t, JSONRPC_INVALID_PARAMS, resp.Error.Code)
+			assert.Equal(t, "Invalid parameters", resp.Error.Message)
+		})
+
+		// failure: virtual index not in the database -> resource not found
+		t.Run("absent", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+			ctx := context.Background()
+
+			app := uint64(1)
+			appID := s.newTestApplication(ctx, t, app)
+			s.createTestEpoch(ctx, t, numberToName(app),
+				repotest.NewEpochBuilder(appID).
+					WithIndex(5).
+					WithStatus(model.EpochStatus_ClaimAccepted).
+					Build())
+
+			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+				"jsonrpc": "2.0",
+				"method": "cartesi_getEpochByVirtualIndex",
+				"params": {
+					"application": "%v",
+					"virtual_index": "%v"
+				},
+				"id": 0
+			}`, numberToName(app), hexutil.EncodeUint64(1)))
+
+			resp := testRPCResponse[any]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			require.NotNil(t, resp.Error)
+			assert.Equal(t, JSONRPC_RESOURCE_NOT_FOUND, resp.Error.Code)
+			assert.Equal(t, "Epoch not found", resp.Error.Message)
+		})
+
+		// failure: application not in the database -> application not found
+		t.Run("absentApplication", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+
+			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+				"jsonrpc": "2.0",
+				"method": "cartesi_getEpochByVirtualIndex",
+				"params": {
+					"application": "%v",
+					"virtual_index": "0x0"
+				},
+				"id": 0
+			}`, numberToName(0xdeadbeef)))
+
+			resp := testRPCResponse[any]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			require.NotNil(t, resp.Error)
+			assert.Equal(t, JSONRPC_APPLICATION_NOT_FOUND, resp.Error.Code)
+			assert.Equal(t, "Application not found", resp.Error.Message)
+		})
+
+		// success: lookup uses the dense virtual index, not the physical epoch index
+		t.Run("presentWithDivergentPhysicalIndex", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+			ctx := context.Background()
+
+			app := uint64(1)
+			appID := s.newTestApplication(ctx, t, app)
+			s.createTestEpoch(ctx, t, numberToName(app),
+				repotest.NewEpochBuilder(appID).
+					WithIndex(5).
+					WithStatus(model.EpochStatus_ClaimAccepted).
+					Build())
+
+			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+				"jsonrpc": "2.0",
+				"method": "cartesi_getEpochByVirtualIndex",
+				"params": {
+					"application": "%v",
+					"virtual_index": "0x0"
+				},
+				"id": 0
+			}`, numberToName(app)))
+
+			resp := testRPCResponse[*model.Epoch]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			require.Nil(t, resp.Error)
+			require.NotNil(t, resp.Result.Data)
+			assert.Equal(t, uint64(5), resp.Result.Data.Index)
+			assert.Equal(t, uint64(0), resp.Result.Data.VirtualIndex)
+		})
+	})
+
 	////////////////////////////////////////////////////////////////////////
 	// getInput
 	////////////////////////////////////////////////////////////////////////
@@ -735,9 +938,141 @@ func TestMethod(t *testing.T) {
 			assert.Equal(t, uint64(0), uint64(resp.Result.Data))
 		})
 
-		// TODO: test with inputs (use createTestEpochWithInput)
+		t.Run("processedInputs", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+			ctx := context.Background()
+
+			app := uint64(1)
+			appID := s.newTestApplication(ctx, t, app)
+			epoch := repotest.NewEpochBuilder(appID).
+				WithIndex(0).
+				WithStatus(model.EpochStatus_ClaimAccepted).
+				Build()
+			inputs := []*model.Input{
+				repotest.NewInputBuilder().WithIndex(0).WithRawData(emptyInput()).Build(),
+				repotest.NewInputBuilder().WithIndex(1).WithRawData(emptyInput()).Build(),
+			}
+			err := s.repository.CreateEpochsAndInputs(
+				ctx,
+				numberToName(app),
+				map[*model.Epoch][]*model.Input{epoch: inputs},
+				10,
+			)
+			require.NoError(t, err)
+			s.advanceInput(ctx, t, appID, 0, 0, nil, nil)
+			s.advanceInput(ctx, t, appID, 0, 1, nil, nil)
+
+			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+				"jsonrpc": "2.0",
+				"method": "cartesi_getProcessedInputCount",
+				"params": { "application": "%s" },
+				"id": 0
+			}`, numberToName(app)))
+
+			resp := testRPCResponse[hex64]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			assert.Nil(t, resp.Error)
+			assert.Equal(t, uint64(2), uint64(resp.Result.Data))
+		})
 	})
 
+	for _, methodName := range []string{
+		"cartesi_getExecutedOutputCount",
+		"cartesi_getPendingExecutableOutputCount",
+	} {
+		t.Run(methodName, func(t *testing.T) {
+			method := getName(t.Name())
+
+			t.Run("absentApplication", func(t *testing.T) {
+				testHistogram.inc(method)
+				s := newTestService(t, t.Name())
+
+				body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+					"jsonrpc": "2.0",
+					"method": "%s",
+					"params": { "application": "%s" },
+					"id": 0
+				}`, method, numberToName(1)))
+
+				resp := testRPCResponse[hex64]{}
+				require.NoError(t, json.Unmarshal(body, &resp))
+				assert.Equal(t, JSONRPC_APPLICATION_NOT_FOUND, resp.Error.Code)
+				assert.Equal(t, "Application not found", resp.Error.Message)
+			})
+
+			t.Run("existingApplicationWithNoOutputs", func(t *testing.T) {
+				testHistogram.inc(method)
+				s := newTestService(t, t.Name())
+				app := uint64(1)
+				s.newTestApplication(context.Background(), t, app)
+
+				body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+					"jsonrpc": "2.0",
+					"method": "%s",
+					"params": { "application": "%s" },
+					"id": 0
+				}`, method, numberToName(app)))
+
+				resp := testRPCResponse[hex64]{}
+				require.NoError(t, json.Unmarshal(body, &resp))
+				assert.Nil(t, resp.Error)
+				assert.Equal(t, uint64(0), uint64(resp.Result.Data))
+			})
+
+			t.Run("outputsPresent", func(t *testing.T) {
+				testHistogram.inc(method)
+				s := newTestService(t, t.Name())
+				ctx := context.Background()
+
+				app := uint64(1)
+				appID := s.newTestApplication(ctx, t, app)
+				epoch := repotest.NewEpochBuilder(appID).
+					WithIndex(0).
+					WithStatus(model.EpochStatus_ClaimAccepted).
+					Build()
+				input := repotest.NewInputBuilder().
+					WithIndex(0).
+					WithRawData(emptyInput()).
+					Build()
+				s.createTestEpochWithInput(ctx, t, numberToName(app), epoch, input)
+				s.advanceInput(ctx, t, appID, 0, 0, [][]byte{
+					emptyVoucher(),
+					{0x10, 0x32, 0x1e, 0x8b},
+					{0xc2, 0x58, 0xd6, 0xe5},
+				}, nil)
+
+				txHash := common.HexToHash("0x1")
+				err := s.repository.UpdateOutputsExecution(
+					ctx,
+					numberToName(app),
+					[]*model.Output{
+						{InputEpochApplicationID: appID, Index: 0, ExecutionTransactionHash: &txHash},
+						{InputEpochApplicationID: appID, Index: 1, ExecutionTransactionHash: &txHash},
+					},
+					10,
+				)
+				require.NoError(t, err)
+
+				body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+					"jsonrpc": "2.0",
+					"method": "%s",
+					"params": { "application": "%s" },
+					"id": 0
+				}`, method, numberToName(app)))
+
+				resp := testRPCResponse[hex64]{}
+				require.NoError(t, json.Unmarshal(body, &resp))
+				assert.Nil(t, resp.Error)
+				expected := uint64(2)
+				if method == "cartesi_getPendingExecutableOutputCount" {
+					expected = 0
+				}
+				assert.Equal(t, expected, uint64(resp.Result.Data))
+			})
+		})
+	}
+
 	////////////////////////////////////////////////////////////////////////
 	// getReport
 	////////////////////////////////////////////////////////////////////////
@@ -943,6 +1278,25 @@ func TestMethod(t *testing.T) {
 			assert.Equal(t, numberToName(nr), resp.Result.Data[0].Name)
 		})
 
+		// success: 1 application is in the database (array params) -> 1
+		t.Run("emptyArrayParams", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+			ctx := context.Background()
+
+			nr := uint64(1)
+			s.newTestApplication(ctx, t, nr)
+			body := s.doRequest(t, 0, []byte(`{
+				"jsonrpc": "2.0",
+				"method": "cartesi_listApplications",
+				"id": 0
+			}`))
+			resp := testRPCResponse[[]model.Application]{}
+			assert.Nil(t, json.Unmarshal(body, &resp))
+			assert.Equal(t, 1, len(resp.Result.Data))
+			assert.Equal(t, numberToName(nr), resp.Result.Data[0].Name)
+		})
+
 		// success: many applications is in the database -> limit (many - 1)
 		t.Run("many", func(t *testing.T) {
 			testHistogram.inc(method)
@@ -1110,6 +1464,86 @@ func TestMethod(t *testing.T) {
 			assert.Equal(t, "Invalid epoch status: invalid value 'INVALID' for EpochStatus enum", resp.Error.Message)
 		})
 
+		// failure: any invalid status in a list -> invalid params
+		t.Run("invalidInList", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+
+			body := s.doRequest(t, 0, []byte(`{
+				"jsonrpc": "2.0",
+				"method": "cartesi_listEpochs",
+				"params": {
+					"application": "app",
+					"status": ["OPEN", "INVALID"]
+				},
+				"id": 0
+			}`))
+
+			resp := testRPCResponse[[]model.Epoch]{}
+			assert.Nil(t, json.Unmarshal(body, &resp))
+			assert.Equal(t, JSONRPC_INVALID_PARAMS, resp.Error.Code)
+			assert.Equal(t, "Invalid epoch status: invalid value 'INVALID' for EpochStatus enum", resp.Error.Message)
+		})
+
+		// failure: an explicitly empty status list -> invalid params
+		t.Run("emptyStatusList", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+
+			body := s.doRequest(t, 0, []byte(`{
+				"jsonrpc": "2.0",
+				"method": "cartesi_listEpochs",
+				"params": {
+					"application": "app",
+					"status": []
+				},
+				"id": 0
+			}`))
+
+			resp := testRPCResponse[[]model.Epoch]{}
+			assert.Nil(t, json.Unmarshal(body, &resp))
+			assert.Equal(t, JSONRPC_INVALID_PARAMS, resp.Error.Code)
+			assert.Equal(t, "Invalid epoch status: expected at least one status", resp.Error.Message)
+		})
+
+		// success: status may contain multiple values
+		t.Run("multipleStatuses", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+			ctx := context.Background()
+
+			nr := uint64(1)
+			appID := s.newTestApplication(ctx, t, nr)
+			for i, status := range []model.EpochStatus{
+				model.EpochStatus_Open,
+				model.EpochStatus_Closed,
+				model.EpochStatus_ClaimAccepted,
+			} {
+				s.createTestEpoch(ctx, t, numberToName(nr),
+					repotest.NewEpochBuilder(appID).
+						WithIndex(uint64(i)).
+						WithStatus(status).
+						Build())
+			}
+
+			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+				"jsonrpc": "2.0",
+				"method": "cartesi_listEpochs",
+				"params": {
+					"application": "%v",
+					"status": ["OPEN", "CLOSED"]
+				},
+				"id": 0
+			}`, numberToName(nr)))
+
+			resp := testRPCResponse[[]model.Epoch]{}
+			assert.Nil(t, json.Unmarshal(body, &resp))
+			assert.Nil(t, resp.Error)
+			assert.Len(t, resp.Result.Data, 2)
+			assert.Equal(t, model.EpochStatus_Open, resp.Result.Data[0].Status)
+			assert.Equal(t, model.EpochStatus_Closed, resp.Result.Data[1].Status)
+		})
+
 		// success: many epochs is in the database -> limit
 		t.Run("many", func(t *testing.T) {
 			testHistogram.inc(method)
@@ -1215,6 +1649,22 @@ func TestMethod(t *testing.T) {
 					assert.Equal(t, nr, resp.Result.Data[i].Index)
 				}
 			}
+
+			{ // inclusive index range
+				body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+					"jsonrpc": "2.0",
+					"method": "cartesi_listEpochs",
+					"params": {"application": "%v", "from": "0x2", "to": "0x4"},
+					"id": 0
+				}`, numberToName(nr)))
+
+				resp := testRPCResponse[[]model.Epoch]{}
+				require.NoError(t, json.Unmarshal(body, &resp))
+				require.Len(t, resp.Result.Data, 3)
+				assert.Equal(t, []uint64{2, 3, 4}, []uint64{
+					resp.Result.Data[0].Index, resp.Result.Data[1].Index, resp.Result.Data[2].Index,
+				})
+			}
 		})
 	})
 
@@ -1329,6 +1779,18 @@ func TestMethod(t *testing.T) {
 				assert.JSONEq(t, fmt.Sprintf("%q", txHash.Hex()), string(input["transaction_hash"]))
 				assert.NotContains(t, input, "transaction_reference")
 			}
+
+			body = s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+				"jsonrpc": "2.0",
+				"method": "cartesi_listInputs",
+				"params": {"application": "%v", "from": "0x1", "to": "0x2"},
+				"id": 0
+			}`, numberToName(app)))
+			resp = testRPCResponse[[]map[string]json.RawMessage]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			require.Len(t, resp.Result.Data, 2)
+			assert.JSONEq(t, `"0x1"`, string(resp.Result.Data[0]["index"]))
+			assert.JSONEq(t, `"0x2"`, string(resp.Result.Data[1]["index"]))
 		})
 
 		// failure: malformed transaction hash -> invalid params, not an
@@ -1530,6 +1992,62 @@ func TestMethod(t *testing.T) {
 					assert.Equal(t, nr, uint64(resp.Result.Data[i].Index))
 				}
 			}
+
+			{ // inclusive index range
+				body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+					"jsonrpc": "2.0",
+					"method": "cartesi_listOutputs",
+					"params": {"application": "%v", "from": "0x2", "to": "0x4"},
+					"id": 0
+				}`, numberToName(app)))
+
+				resp := testRPCResponse[[]Result]{}
+				require.NoError(t, json.Unmarshal(body, &resp))
+				require.Len(t, resp.Result.Data, 3)
+				for i, expected := range []uint64{2, 3, 4} {
+					assert.Equal(t, expected, uint64(resp.Result.Data[i].Index))
+				}
+			}
+		})
+
+		t.Run("executedWithOutputTypeList", func(t *testing.T) {
+			testHistogram.inc(method)
+			s := newTestService(t, t.Name())
+			ctx := context.Background()
+			app := uint64(4)
+			appID := s.newTestApplication(ctx, t, app)
+			epoch := repotest.NewEpochBuilder(appID).WithStatus(model.EpochStatus_ClaimAccepted).Build()
+			input := repotest.NewInputBuilder().WithRawData(emptyInput()).Build()
+			s.createTestEpochWithInput(ctx, t, numberToName(app), epoch, input)
+			s.advanceInput(ctx, t, appID, 0, 0, [][]byte{
+				emptyVoucher(),
+				{0x10, 0x32, 0x1e, 0x8b},
+				{0xc2, 0x58, 0xd6, 0xe5},
+				emptyVoucher(),
+			}, nil)
+
+			txHash := common.HexToHash("0x1")
+			err := s.repository.UpdateOutputsExecution(ctx, numberToName(app), []*model.Output{{
+				InputEpochApplicationID: appID, Index: 3, ExecutionTransactionHash: &txHash,
+			}}, 10)
+			require.NoError(t, err)
+
+			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+				"jsonrpc": "2.0",
+				"method": "cartesi_listOutputs",
+				"params": {
+					"application": "%v",
+					"executed": true,
+					"output_type": ["0x237a816f", "0x10321e8b"]
+				},
+				"id": 0
+			}`, numberToName(app)))
+
+			resp := testRPCResponse[[]model.Output]{}
+			require.NoError(t, json.Unmarshal(body, &resp))
+			require.Nil(t, resp.Error)
+			require.Len(t, resp.Result.Data, 1)
+			assert.Equal(t, uint64(3), resp.Result.Data[0].Index)
 		})
 	})
 
@@ -1702,6 +2220,22 @@ func TestMethod(t *testing.T) {
 					assert.Equal(t, nr, uint64(resp.Result.Data[i].Index))
 				}
 			}
+
+			{ // inclusive index range
+				body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
+					"jsonrpc": "2.0",
+					"method": "cartesi_listReports",
+					"params": {"application": "%v", "from": "0x2", "to": "0x4"},
+					"id": 0
+				}`, numberToName(app)))
+
+				resp := testRPCResponse[[]Result]{}
+				require.NoError(t, json.Unmarshal(body, &resp))
+				require.Len(t, resp.Result.Data, 3)
+				for i, expected := range []uint64{2, 3, 4} {
+					assert.Equal(t, expected, uint64(resp.Result.Data[i].Index))
+				}
+			}
 		})
 	})
 
@@ -2358,9 +2892,9 @@ func TestMethod(t *testing.T) {
 	})
 
 	////////////////////////////////////////////////////////////////////////
-	// getMatchAdvanced
+	// getMatchAdvance
 	////////////////////////////////////////////////////////////////////////
-	t.Run("cartesi_getMatchAdvanced", func(t *testing.T) {
+	t.Run("cartesi_getMatchAdvance", func(t *testing.T) {
 		method := getName(t.Name())
 
 		// failure: epoch_index not hex encoded -> invalid param
@@ -2373,7 +2907,7 @@ func TestMethod(t *testing.T) {
 
 			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
 				"jsonrpc": "2.0",
-				"method": "cartesi_getMatchAdvanced",
+				"method": "cartesi_getMatchAdvance",
 				"params": {
 				"application": "%v",
 				"epoch_index": "%v"
@@ -2405,7 +2939,7 @@ func TestMethod(t *testing.T) {
 
 			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
 				"jsonrpc": "2.0",
-				"method": "cartesi_getMatchAdvanced",
+				"method": "cartesi_getMatchAdvance",
 				"params": {
 				"application": "%v",
 				"epoch_index": "0x%020x",
@@ -2430,7 +2964,7 @@ func TestMethod(t *testing.T) {
 			nr := uint64(0xdeadbeef)
 			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
 				"jsonrpc": "2.0",
-				"method": "cartesi_getMatchAdvanced",
+				"method": "cartesi_getMatchAdvance",
 				"params": {
 				"application": "%v",
 				"epoch_index": "0x%020x",
@@ -2457,7 +2991,8 @@ func TestMethod(t *testing.T) {
 			nr := uint64(2)
 			address := common.HexToAddress("0x03")
 			idHash := common.HexToHash("0x04")
-			parent := common.HexToHash("0x05")
+			parentHex := "0xAbCdEf0123456789aBcDeF0123456789AbCdEf0123456789aBcDeF0123456789"
+			parent := common.HexToHash(parentHex)
 
 			appID := s.newTestApplication(ctx, t, app)
 			s.createTestEpoch(ctx, t, numberToName(app),
@@ -2503,16 +3038,16 @@ func TestMethod(t *testing.T) {
 
 			body := s.doRequest(t, 0, fmt.Appendf([]byte{}, `{
 				"jsonrpc": "2.0",
-				"method": "cartesi_getMatchAdvanced",
+				"method": "cartesi_getMatchAdvance",
 				"params": {
 				"application": "%v",
 				"epoch_index": "0x%020x",
 				"tournament_address": "0x%020x",
 				"id_hash": "0x%064x",
-				"parent": "0x%064x"
+				"parent": "%s"
 				},
 				"id": 0
-				}`, numberToName(app), nr, address, idHash, parent))
+				}`, numberToName(app), nr, address, idHash, parentHex))
 
 			resp := testRPCResponse[getMatchAdvancedResult]{}
 			assert.Nil(t, json.Unmarshal(body, &resp))
@@ -3477,3 +4012,118 @@ func TestMethod(t *testing.T) {
 		t.Errorf("Method coverage issues:\n%s", strings.Join(errors, "\n"))
 	}
 }
+
+func TestListIndexRangeValidation(t *testing.T) {
+	for _, method := range []string{
+		"cartesi_listEpochs",
+		"cartesi_listInputs",
+		"cartesi_listOutputs",
+		"cartesi_listReports",
+	} {
+		t.Run(method, func(t *testing.T) {
+			s := newBatchTestService()
+			body := []byte(fmt.Sprintf(`{
+				"jsonrpc":"2.0",
+				"method":%q,
+				"params":{"application":"app","from":"0x2","to":"0x1"},
+				"id":1
+			}`, method))
+			rr := serveRPC(t, s, body)
+
+			require.Equal(t, http.StatusOK, rr.Code)
+			response := decodeRPCResponse(t, rr.Body.Bytes())
+			requireRPCError(t, response, float64(1), JSONRPC_INVALID_PARAMS)
+			require.Equal(t, "invalid index range: from must be less than or equal to to", response.Error.Message)
+		})
+	}
+}
+
+func TestListOffsetValidation(t *testing.T) {
+	for _, method := range []string{
+		"cartesi_listApplications",
+		"cartesi_listEpochs",
+		"cartesi_listInputs",
+		"cartesi_listOutputs",
+		"cartesi_listReports",
+		"cartesi_listWithdrawals",
+		"cartesi_listTournaments",
+		"cartesi_listCommitments",
+		"cartesi_listMatches",
+		"cartesi_listMatchAdvances",
+	} {
+		t.Run(method, func(t *testing.T) {
+			s := newBatchTestService()
+			body := []byte(fmt.Sprintf(`{
+				"jsonrpc":"2.0",
+				"method":%q,
+				"params":{"offset":9223372036854775808},
+				"id":1
+			}`, method))
+			rr := serveRPC(t, s, body)
+
+			response := decodeRPCResponse(t, rr.Body.Bytes())
+			requireRPCError(t, response, float64(1), JSONRPC_INVALID_PARAMS)
+			require.Equal(t, "Invalid offset", response.Error.Message)
+		})
+	}
+
+	t.Run("positional parameters", func(t *testing.T) {
+		s := newBatchTestService()
+		rr := serveRPC(t, s, []byte(`{
+			"jsonrpc":"2.0",
+			"method":"cartesi_listApplications",
+			"params":[50,9223372036854775808],
+			"id":1
+		}`))
+
+		response := decodeRPCResponse(t, rr.Body.Bytes())
+		requireRPCError(t, response, float64(1), JSONRPC_INVALID_PARAMS)
+		require.Equal(t, "Invalid offset", response.Error.Message)
+	})
+}
+
+func TestParseIndexRange(t *testing.T) {
+	from := "0x2"
+	to := "0x4"
+	indexRange, err := parseIndexRange(&from, &to)
+	require.NoError(t, err)
+	require.Equal(t, repository.Range{Start: 2, End: 4}, *indexRange)
+
+	indexRange, err = parseIndexRange(&from, nil)
+	require.NoError(t, err)
+	require.Equal(t, uint64(2), indexRange.Start)
+	require.Equal(t, uint64(math.MaxUint64), indexRange.End)
+
+	indexRange, err = parseIndexRange(nil, &to)
+	require.NoError(t, err)
+	require.Equal(t, uint64(0), indexRange.Start)
+	require.Equal(t, uint64(4), indexRange.End)
+
+	invalid := "2"
+	_, err = parseIndexRange(&invalid, nil)
+	require.EqualError(t, err, "invalid from index: expected hex encoded value")
+	_, err = parseIndexRange(nil, &invalid)
+	require.EqualError(t, err, "invalid to index: expected hex encoded value")
+}
+
+func TestRequestMethodIsInfoLogged(t *testing.T) {
+	s := newBatchTestService()
+	var logs bytes.Buffer
+	s.Logger = slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelInfo}))
+
+	method := strings.Repeat("a", MAX_LOGGED_METHOD_LEN+32)
+	body := []byte(fmt.Sprintf(`{"jsonrpc":"2.0","method":%q,"id":1}`, method))
+	serveRPC(t, s, body)
+
+	var methodLogs int
+	for _, line := range strings.Split(strings.TrimSpace(logs.String()), "\n") {
+		var record map[string]any
+		require.NoError(t, json.Unmarshal([]byte(line), &record))
+		if record["method"] == truncatedMethod(method) {
+			require.Equal(t, "INFO", record["level"])
+			methodLogs++
+		}
+		require.NotEqual(t, method, record["method"])
+	}
+	require.Positive(t, methodLogs)
+}
diff --git a/internal/jsonrpc/limitedwriter.go b/internal/jsonrpc/limitedwriter.go
new file mode 100644
index 000000000..e5ae71569
--- /dev/null
+++ b/internal/jsonrpc/limitedwriter.go
@@ -0,0 +1,82 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package jsonrpc
+
+import (
+	"bytes"
+	"io"
+)
+
+// budgetWriter tracks the response bytes available to one HTTP request. A
+// batch shares this budget across all of its entries; a single request uses the
+// same budget for its sole response.
+//
+// Each response is first encoded into a limitedWriter and only reaches writer
+// when Flush succeeds. If any response exceeds the remaining budget, that
+// response is discarded atomically and the budgetWriter is permanently
+// closed. NewLimitedWriter then returns nil, causing every remaining batch
+// entry to receive the response-size-limit error, even if that entry's response
+// would fit in the unused budget. The response that causes closure does not
+// consume any budget.
+type budgetWriter struct {
+	writer io.Writer
+	budget int
+	closed bool
+}
+
+// newBudgetWriter creates a response budget of exactly limit bytes. A response
+// whose encoded size equals the remaining budget is allowed.
+func newBudgetWriter(writer io.Writer, limit int) *budgetWriter {
+	return &budgetWriter{
+		writer: writer,
+		budget: limit,
+	}
+}
+
+// Write commits an already-buffered response and deducts successfully written
+// bytes from the shared budget.
+func (w *budgetWriter) Write(data []byte) (int, error) {
+	written, err := w.writer.Write(data)
+	if err == nil {
+		w.budget -= written
+	}
+	return written, err
+}
+
+// NewLimitedWriter creates an atomic buffer for the next response. It returns
+// nil after any response has exceeded the shared budget.
+func (w *budgetWriter) NewLimitedWriter() *limitedWriter {
+	if w.closed {
+		return nil
+	}
+	return &limitedWriter{writer: w}
+}
+
+// limitedWriter buffers one complete JSON-RPC response before committing it to
+// its shared budgetWriter.
+type limitedWriter struct {
+	writer *budgetWriter
+	buffer bytes.Buffer
+}
+
+// Write appends data while the complete buffered response fits in the remaining
+// budget. An overflowing write returns io.ErrShortBuffer, discards the response
+// on Flush, and permanently closes the shared budget.
+func (w *limitedWriter) Write(data []byte) (int, error) {
+	if w.buffer.Len()+len(data) > w.writer.budget {
+		w.writer.closed = true
+		return 0, io.ErrShortBuffer
+	}
+	return w.buffer.Write(data)
+}
+
+// Flush atomically commits the buffered response unless an overflow has closed
+// the shared budget. A flush after closure is intentionally a no-op.
+func (w *limitedWriter) Flush() error {
+	if w.writer.closed {
+		return nil
+	}
+	_, err := w.writer.Write(w.buffer.Bytes())
+	return err
+}
diff --git a/internal/jsonrpc/limitedwriter_test.go b/internal/jsonrpc/limitedwriter_test.go
new file mode 100644
index 000000000..3bf654c5c
--- /dev/null
+++ b/internal/jsonrpc/limitedwriter_test.go
@@ -0,0 +1,121 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package jsonrpc
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestLimitedWriterFlushesWithinBudget(t *testing.T) {
+	var output bytes.Buffer
+	budget := newBudgetWriter(&output, 5)
+	writer := budget.NewLimitedWriter()
+	require.NotNil(t, writer)
+
+	written, err := writer.Write([]byte("he"))
+	require.NoError(t, err)
+	assert.Equal(t, 2, written)
+
+	written, err = writer.Write([]byte("llo"))
+	require.NoError(t, err)
+	assert.Equal(t, 3, written)
+	assert.Empty(t, output.String(), "writes should remain buffered until Flush")
+	assert.Equal(t, 5, budget.budget, "buffered writes should not consume the budget")
+
+	require.NoError(t, writer.Flush())
+	assert.Equal(t, "hello", output.String())
+	assert.Zero(t, budget.budget)
+}
+
+func TestLimitedWriterRejectsWriteBeyondBudget(t *testing.T) {
+	var output bytes.Buffer
+	budget := newBudgetWriter(&output, 4)
+	writer := budget.NewLimitedWriter()
+	require.NotNil(t, writer)
+
+	written, err := writer.Write([]byte("abc"))
+	require.NoError(t, err)
+	assert.Equal(t, 3, written)
+
+	written, err = writer.Write([]byte("de"))
+	assert.ErrorIs(t, err, io.ErrShortBuffer)
+	assert.Zero(t, written)
+	assert.Nil(t, budget.NewLimitedWriter(), "exceeding the budget should close the budget writer")
+
+	require.NoError(t, writer.Flush())
+	assert.Empty(t, output.String(), "a response that exceeded the budget should be discarded")
+	assert.Equal(t, 4, budget.budget)
+}
+
+func TestLimitedWritersShareBudget(t *testing.T) {
+	var output bytes.Buffer
+	budget := newBudgetWriter(&output, 6)
+
+	first := budget.NewLimitedWriter()
+	require.NotNil(t, first)
+	_, err := first.Write([]byte("one"))
+	require.NoError(t, err)
+	require.NoError(t, first.Flush())
+
+	second := budget.NewLimitedWriter()
+	require.NotNil(t, second)
+	_, err = second.Write([]byte("two"))
+	require.NoError(t, err)
+	require.NoError(t, second.Flush())
+
+	assert.Equal(t, "onetwo", output.String())
+	assert.Zero(t, budget.budget)
+
+	third := budget.NewLimitedWriter()
+	require.NotNil(t, third)
+	written, err := third.Write([]byte("x"))
+	assert.ErrorIs(t, err, io.ErrShortBuffer)
+	assert.Zero(t, written)
+	assert.Nil(t, budget.NewLimitedWriter())
+}
+
+func TestLimitedWriterAllowsEmptyWriteAtExhaustedBudget(t *testing.T) {
+	budget := newBudgetWriter(io.Discard, 0)
+	writer := budget.NewLimitedWriter()
+	require.NotNil(t, writer)
+
+	written, err := writer.Write(nil)
+	require.NoError(t, err)
+	assert.Zero(t, written)
+	assert.False(t, budget.closed)
+	require.NoError(t, writer.Flush())
+}
+
+func TestLimitedWriterFlushPropagatesWriterError(t *testing.T) {
+	expectedErr := errors.New("write failed")
+	underlying := &stubWriter{written: 2, err: expectedErr}
+	budget := newBudgetWriter(underlying, 4)
+	writer := budget.NewLimitedWriter()
+	require.NotNil(t, writer)
+
+	_, err := writer.Write([]byte("data"))
+	require.NoError(t, err)
+
+	err = writer.Flush()
+	assert.ErrorIs(t, err, expectedErr)
+	assert.Equal(t, []byte("data"), underlying.data)
+	assert.Equal(t, 4, budget.budget, "a failed underlying write should not consume budget")
+}
+
+type stubWriter struct {
+	written int
+	err     error
+	data    []byte
+}
+
+func (w *stubWriter) Write(data []byte) (int, error) {
+	w.data = append(w.data, data...)
+	return w.written, w.err
+}
diff --git a/internal/jsonrpc/main_test.go b/internal/jsonrpc/main_test.go
new file mode 100644
index 000000000..16a32219d
--- /dev/null
+++ b/internal/jsonrpc/main_test.go
@@ -0,0 +1,28 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package jsonrpc
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/cartesi/rollups-node/test/tooling/db"
+)
+
+func TestMain(m *testing.M) {
+	endpoint, err := db.GetTestDatabaseEndpoint()
+	if err != nil {
+		os.Exit(m.Run())
+	}
+	release, err := db.LockTestPostgres(context.Background(), endpoint)
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+	code := m.Run()
+	release()
+	os.Exit(code)
+}
diff --git a/internal/jsonrpc/service.go b/internal/jsonrpc/service.go
index f39ad2157..1a85c357a 100644
--- a/internal/jsonrpc/service.go
+++ b/internal/jsonrpc/service.go
@@ -5,6 +5,7 @@ package jsonrpc
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"net"
@@ -20,7 +21,10 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 )
 
-const jsonrpcShutdownTimeout = 5 * time.Second
+const (
+	jsonrpcShutdownTimeout = 5 * time.Second
+	jsonrpcWriteHeadroom   = 5 * time.Second
+)
 
 // -----------------------------------------------------------------------------
 // Service Implementation
@@ -37,6 +41,12 @@ type Service struct {
 	// listen opens the HTTP listener. It defaults to net.Listen and is
 	// overridden in tests so Serve() can be exercised without real sockets.
 	listen func(network, address string) (net.Listener, error)
+	// OpenAPI description for JSON-RPC API loaded from 'jsonrpc-discover.json' file
+	discoverSpec json.RawMessage
+	handlers     dispatchTable
+	// dispatchTimeout expires requests early enough to serialize a complete
+	// timeout response before the HTTP server's write deadline.
+	dispatchTimeout time.Duration
 }
 
 type CreateInfo struct {
@@ -62,10 +72,19 @@ func Create(ctx context.Context, c *CreateInfo) (*Service, error) {
 	}
 
 	s.repository = c.Repository
+	s.handlers = cloneDispatchTable(jsonrpcHandlers)
 	if s.repository == nil {
 		return nil, fmt.Errorf("repository on validator service Create is nil")
 	}
 
+	data, err := discoverSpec.ReadFile("jsonrpc-discover.json")
+	if err != nil {
+		return nil, fmt.Errorf("unable to read jsonrpc-discover content: %w", err)
+	}
+	if err := json.Unmarshal(data, &s.discoverSpec); err != nil {
+		return nil, fmt.Errorf("unable to unmarshal discovery spec JSON: %w", err)
+	}
+
 	s.inputABI, err = inputs.InputsMetaData.GetAbi()
 	if err != nil {
 		return nil, err
@@ -90,7 +109,9 @@ func Create(ctx context.Context, c *CreateInfo) (*Service, error) {
 			[]string{"POST", "OPTIONS"}, []string{"Content-Type"}),
 	})
 
-	s.server = service.NewHTTPServer(c.Config.JsonrpcApiAddress, handler, service.DefaultJSONRPCOptions(), s.Logger)
+	serverOpts := service.DefaultJSONRPCOptions()
+	s.dispatchTimeout = serverOpts.WriteTimeout - jsonrpcWriteHeadroom
+	s.server = service.NewHTTPServer(c.Config.JsonrpcApiAddress, handler, serverOpts, s.Logger)
 	service.StartupBindWarning(s.Logger, "jsonrpc", c.Config.JsonrpcApiAddress)
 
 	if s.listen == nil {
diff --git a/internal/jsonrpc/service_test.go b/internal/jsonrpc/service_test.go
index e4ad62ba9..99fcadbbf 100644
--- a/internal/jsonrpc/service_test.go
+++ b/internal/jsonrpc/service_test.go
@@ -5,10 +5,13 @@ package jsonrpc
 
 import (
 	"bytes"
+	"encoding/json"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"strconv"
 	"testing"
+	"time"
 
 	"github.com/cartesi/rollups-node/pkg/service"
 
@@ -48,6 +51,36 @@ func TestJSONRPC_HardenedServerOptions(t *testing.T) {
 	require.Equal(t, opts.IdleTimeout, s.server.IdleTimeout)
 	require.Equal(t, opts.MaxHeaderBytes, s.server.MaxHeaderBytes)
 	require.NotNil(t, s.server.ErrorLog)
+	require.Equal(t, opts.WriteTimeout-jsonrpcWriteHeadroom, s.dispatchTimeout)
+}
+
+func TestJSONRPC_ServerHandlerAppliesBatchDispatchTimeout(t *testing.T) {
+	s := newTestService(t, "jsonrpc-dispatch-timeout")
+	s.dispatchTimeout = 10 * time.Millisecond
+
+	const method = "test_server_dispatch_timeout"
+	withTestRPCHandler(t, s, method, func(s *Service, r *http.Request, _ RPCRequest) (any, error) {
+		<-r.Context().Done()
+		return nil, s.repositoryError(r.Context(), "Unable to retrieve test data from repository",
+			fmt.Errorf("repository query failed: %w", r.Context().Err()))
+	})
+
+	body := []byte(fmt.Sprintf(`[
+		{"jsonrpc":"2.0","method":%q,"id":1},
+		{"jsonrpc":"2.0","method":%q,"id":2},
+		{"jsonrpc":"2.0","method":%q,"id":3}
+	]`, method, method, method))
+	req := httptest.NewRequest(http.MethodPost, "/rpc", bytes.NewReader(body))
+	req.Header.Set("Content-Type", "application/json")
+	rr := httptest.NewRecorder()
+	s.server.Handler.ServeHTTP(rr, req)
+
+	var responses []RPCResponse
+	require.NoError(t, json.Unmarshal(rr.Body.Bytes(), &responses))
+	require.Len(t, responses, 3)
+	requireRPCError(t, responses[0], float64(1), JSONRPC_TIMEOUT_ERROR)
+	requireRPCError(t, responses[1], float64(2), JSONRPC_TIMEOUT_ERROR)
+	requireRPCError(t, responses[2], float64(3), JSONRPC_TIMEOUT_ERROR)
 }
 
 // TestJSONRPC_RequestIDPropagated verifies the middleware chain echoes a
diff --git a/internal/jsonrpc/types.go b/internal/jsonrpc/types.go
index 46607995e..d9051b9c6 100644
--- a/internal/jsonrpc/types.go
+++ b/internal/jsonrpc/types.go
@@ -4,11 +4,9 @@
 package jsonrpc
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
-	"net/http"
-	"reflect"
+	"io"
 	"regexp"
 
 	"github.com/cartesi/rollups-node/internal/config"
@@ -22,96 +20,53 @@ type RPCRequest struct {
 	JSONRPC string          `json:"jsonrpc"`
 	Method  string          `json:"method"`
 	Params  json.RawMessage `json:"params"`
-	ID      any             `json:"id"`
+	ID      json.RawMessage `json:"id"`
 }
 
 type RPCResponse struct {
-	JSONRPC string    `json:"jsonrpc"`
-	Result  any       `json:"result,omitempty"`
-	Error   *RPCError `json:"error,omitempty"`
-	ID      any       `json:"id"`
+	JSONRPC string          `json:"jsonrpc"`
+	Result  any             `json:"result,omitempty"`
+	Error   *RPCError       `json:"error,omitempty"`
+	ID      json.RawMessage `json:"id"`
 }
 
 type RPCError struct {
 	Code    int    `json:"code"`
 	Message string `json:"message"`
-	Data    any    `json:"data,omitempty"`
+}
+
+func (e *RPCError) Error() string {
+	return e.Message
+}
+
+func newRPCError(code int, message string) error {
+	return &RPCError{Code: code, Message: message}
 }
 
 // writeRPCError sends a generic error response for internal errors.
-func writeRPCError(w http.ResponseWriter, id any, code int, message string, data any) {
+func writeRPCError(w io.Writer, id json.RawMessage, code int, message string) error {
 	// Hide detailed error info for internal errors.
 	if code == JSONRPC_INTERNAL_ERROR {
 		message = "Internal server error"
-		data = nil
 	}
 	resp := RPCResponse{
 		JSONRPC: "2.0",
 		Error: &RPCError{
 			Code:    code,
 			Message: message,
-			Data:    data,
 		},
 		ID: id,
 	}
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(resp)
+	return json.NewEncoder(w).Encode(resp)
 }
 
-func writeRPCResult(w http.ResponseWriter, id any, result any) {
+func writeRPCResult(w io.Writer, id json.RawMessage, result any) error {
 	resp := RPCResponse{
 		JSONRPC: "2.0",
 		Result:  result,
 		ID:      id,
 	}
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(resp)
-}
-
-// UnmarshalParams supports both by-name (object) and by-position (array) parameter structures.
-// If params is an object, it simply does json.Unmarshal; if it's an array, it will attempt
-// to unmarshal each positional parameter into the target struct field in declaration order.
-func UnmarshalParams(data json.RawMessage, target any) error {
-	data = bytes.TrimSpace(data)
-	if len(data) > 0 && data[0] == '[' {
-		// Unmarshal positional parameters into a slice of json.RawMessage.
-		var rawParams []json.RawMessage
-		if err := json.Unmarshal(data, &rawParams); err != nil {
-			return err
-		}
-		// Use reflection to set values in the target struct in the order they appear.
-		val := reflect.ValueOf(target)
-		if val.Kind() != reflect.Pointer || val.IsNil() {
-			return fmt.Errorf("error unmarshalling positional parameters target must be a non-nil pointer to a struct")
-		}
-		val = val.Elem()
-		if val.Kind() != reflect.Struct {
-			return fmt.Errorf("error unmarshalling positional parameters target must point to a struct")
-		}
-		typ := val.Type()
-		if len(rawParams) > typ.NumField() {
-			return fmt.Errorf("error unmarshalling positional parameters, expected %d params, got %d",
-				typ.NumField(), len(rawParams))
-		}
-		// For each field in the struct, if a positional parameter exists, unmarshal that parameter.
-		for i := 0; i < typ.NumField() && i < len(rawParams); i++ {
-			sf := typ.Field(i)
-			if sf.Tag.Get("json") == "-" {
-				continue
-			}
-			field := val.Field(i)
-			if !field.CanSet() {
-				return fmt.Errorf("error unmarshalling positional parameter field %q is not settable", typ.Field(i).Name)
-			}
-			// Unmarshal the corresponding raw parameter into the field.
-			if err := json.Unmarshal(rawParams[i], field.Addr().Interface()); err != nil {
-				return fmt.Errorf("error unmarshalling positional parameter %d for field %s: %w", i, typ.Field(i).Name, err)
-			}
-		}
-		return nil
-	}
-	// Otherwise, assume by-name structure.
-	return json.Unmarshal(data, target)
+	return json.NewEncoder(w).Encode(resp)
 }
 
 // -----------------------------------------------------------------------------
diff --git a/internal/jsonrpc/util_test.go b/internal/jsonrpc/util_test.go
index e68660282..aadfbe8f5 100644
--- a/internal/jsonrpc/util_test.go
+++ b/internal/jsonrpc/util_test.go
@@ -96,6 +96,7 @@ func newTestServiceFull(t *testing.T, name string, maxInflight uint64, corsOrigi
 
 	repo, err := factory.NewRepositoryFromConnectionString(ctx, dbTestEndpoint)
 	require.NoError(t, err)
+	t.Cleanup(repo.Close)
 
 	logLevel, err := config.GetLogLevel()
 	require.NoError(t, err)
diff --git a/internal/repository/postgres/epoch.go b/internal/repository/postgres/epoch.go
index 8930eecc0..5a9b8986e 100644
--- a/internal/repository/postgres/epoch.go
+++ b/internal/repository/postgres/epoch.go
@@ -842,6 +842,12 @@ func (r *PostgresRepository) ListEpochs(
 		)
 
 	conditions := []postgres.BoolExpression{whereClause}
+	if f.IndexRange != nil {
+		conditions = append(conditions,
+			table.Epoch.Index.GT_EQ(uint64Expr(f.IndexRange.Start)),
+			table.Epoch.Index.LT_EQ(uint64Expr(f.IndexRange.End)),
+		)
+	}
 	if len(f.Status) > 0 {
 		statuses := make([]postgres.Expression, 0, len(f.Status))
 		for _, status := range f.Status {
diff --git a/internal/repository/postgres/input.go b/internal/repository/postgres/input.go
index c826387a1..67049469e 100644
--- a/internal/repository/postgres/input.go
+++ b/internal/repository/postgres/input.go
@@ -229,6 +229,12 @@ func (r *PostgresRepository) ListInputs(
 		)
 
 	conditions := []postgres.BoolExpression{whereClause}
+	if f.IndexRange != nil {
+		conditions = append(conditions,
+			table.Input.Index.GT_EQ(uint64Expr(f.IndexRange.Start)),
+			table.Input.Index.LT_EQ(uint64Expr(f.IndexRange.End)),
+		)
+	}
 	if f.EpochIndex != nil {
 		conditions = append(conditions, table.Input.EpochIndex.EQ(uint64Expr(*f.EpochIndex)))
 	}
diff --git a/internal/repository/postgres/output.go b/internal/repository/postgres/output.go
index b18f54b28..b2c2dc6f1 100644
--- a/internal/repository/postgres/output.go
+++ b/internal/repository/postgres/output.go
@@ -21,6 +21,33 @@ var (
 	voucherSelector             = []byte{0x23, 0x7a, 0x81, 0x6f}
 )
 
+func outputExecutionCondition(executed bool) postgres.BoolExpression {
+	if executed {
+		return table.Output.ExecutionTransactionHash.IS_NOT_NULL()
+	}
+	return table.Output.ExecutionTransactionHash.IS_NULL()
+}
+
+func outputTypesCondition(selectors [][]byte) postgres.BoolExpression {
+	values := make([]postgres.Expression, 0, len(selectors))
+	for _, selector := range selectors {
+		values = append(values, ByteaLiteral(selector))
+	}
+	return SubstrBytea(table.Output.RawData, 1, 4).IN(values...)
+}
+
+// outputVoucherTypesCondition uses literals so PostgreSQL can prove
+// that the condition implies output_pending_voucher_idx's predicate even when
+// pgx executes the query with a generic prepared plan.
+func outputVoucherTypesCondition() postgres.BoolExpression {
+	return outputTypesCondition(
+		[][]byte{
+			voucherSelector,
+			delegateCallVoucherSelector,
+		},
+	)
+}
+
 func (r *PostgresRepository) GetOutput(
 	ctx context.Context,
 	nameOrAddress string,
@@ -169,6 +196,12 @@ func (r *PostgresRepository) ListOutputs(
 	)
 
 	conditions := []postgres.BoolExpression{whereClause}
+	if f.IndexRange != nil {
+		conditions = append(conditions,
+			table.Output.Index.GT_EQ(uint64Expr(f.IndexRange.Start)),
+			table.Output.Index.LT_EQ(uint64Expr(f.IndexRange.End)),
+		)
+	}
 	if f.BlockRange != nil {
 		conditions = append(conditions, table.Input.BlockNumber.BETWEEN(
 			uint64Expr(f.BlockRange.Start),
@@ -186,10 +219,12 @@ func (r *PostgresRepository) ListOutputs(
 		conditions = append(conditions, table.Output.InputIndex.EQ(uint64Expr(*f.InputIndex)))
 	}
 
-	if f.OutputType != nil {
-		conditions = append(conditions,
-			SubstrBytea(table.Output.RawData, 1, 4).EQ(postgres.Bytea(*f.OutputType)),
-		)
+	if f.OutputType != nil && len(*f.OutputType) > 0 {
+		conditions = append(conditions, outputTypesCondition(*f.OutputType))
+	}
+
+	if f.Executed != nil {
+		conditions = append(conditions, outputExecutionCondition(*f.Executed))
 	}
 
 	if f.VoucherAddress != nil {
@@ -199,10 +234,7 @@ func (r *PostgresRepository) ListOutputs(
 		// inline literals, is also what lets the planner prove the partial
 		// predicate of output_raw_data_address_idx.
 		conditions = append(conditions,
-			SubstrBytea(table.Output.RawData, 1, 4).IN(
-				ByteaLiteral(voucherSelector),
-				ByteaLiteral(delegateCallVoucherSelector),
-			),
+			outputVoucherTypesCondition(),
 			SubstrBytea(table.Output.RawData, 17, 20).EQ(postgres.Bytea(f.VoucherAddress.Bytes())),
 		)
 	}
@@ -319,8 +351,6 @@ func (r *PostgresRepository) GetNumberOfPendingExecutableOutputs(
 ) (uint64, error) {
 
 	whereClause := getWhereClauseFromNameOrAddress(nameOrAddress)
-	outputType := SubstrBytea(table.Output.RawData, 1, 4)
-
 	sel := table.Output.
 		SELECT(postgres.COUNT(postgres.STAR)).
 		FROM(
@@ -331,9 +361,8 @@ func (r *PostgresRepository) GetNumberOfPendingExecutableOutputs(
 		).
 		WHERE(
 			whereClause.
-				AND(table.Output.ExecutionTransactionHash.IS_NULL()).
-				AND(outputType.EQ(postgres.Bytea(delegateCallVoucherSelector)).
-					OR(outputType.EQ(postgres.Bytea(voucherSelector)))),
+				AND(outputExecutionCondition(false)).
+				AND(outputVoucherTypesCondition()),
 		)
 
 	sqlStr, args := sel.Sql()
diff --git a/internal/repository/postgres/postgres_repo_test.go b/internal/repository/postgres/postgres_repo_test.go
index 642bacb0c..0fd18784c 100644
--- a/internal/repository/postgres/postgres_repo_test.go
+++ b/internal/repository/postgres/postgres_repo_test.go
@@ -6,6 +6,7 @@ package postgres_test
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/cartesi/rollups-node/internal/model"
@@ -18,6 +19,21 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestMain(m *testing.M) {
+	endpoint, err := db.GetTestDatabaseEndpoint()
+	if err != nil {
+		os.Exit(m.Run())
+	}
+	release, err := db.LockTestPostgres(context.Background(), endpoint)
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+	code := m.Run()
+	release()
+	os.Exit(code)
+}
+
 func TestPostgresRepository(t *testing.T) {
 	endpoint, err := db.GetTestDatabaseEndpoint()
 	if err != nil {
diff --git a/internal/repository/postgres/report.go b/internal/repository/postgres/report.go
index d653ad9a1..b011e57ff 100644
--- a/internal/repository/postgres/report.go
+++ b/internal/repository/postgres/report.go
@@ -90,6 +90,12 @@ func (r *PostgresRepository) ListReports(
 	)
 
 	conditions := []postgres.BoolExpression{whereClause}
+	if f.IndexRange != nil {
+		conditions = append(conditions,
+			table.Report.Index.GT_EQ(uint64Expr(f.IndexRange.Start)),
+			table.Report.Index.LT_EQ(uint64Expr(f.IndexRange.End)),
+		)
+	}
 	if f.InputIndex != nil {
 		conditions = append(conditions, table.Report.InputIndex.EQ(uint64Expr(*f.InputIndex)))
 	}
diff --git a/internal/repository/postgres/schema/migrations/000001_create_initial_schema.down.sql b/internal/repository/postgres/schema/migrations/000001_create_initial_schema.down.sql
index dc333f594..553bd3ecf 100644
--- a/internal/repository/postgres/schema/migrations/000001_create_initial_schema.down.sql
+++ b/internal/repository/postgres/schema/migrations/000001_create_initial_schema.down.sql
@@ -39,6 +39,8 @@ DROP TABLE IF EXISTS "withdrawal";
 
 DROP TRIGGER IF EXISTS "output_set_updated_at" ON "output";
 DROP INDEX IF EXISTS "output_input_index_idx";
+DROP INDEX IF EXISTS "output_pending_voucher_idx";
+DROP INDEX IF EXISTS "output_executed_idx";
 DROP INDEX IF EXISTS "output_raw_data_address_idx";
 DROP INDEX IF EXISTS "output_raw_data_type_idx";
 DROP TABLE IF EXISTS "output";
diff --git a/internal/repository/postgres/schema/migrations/000001_create_initial_schema.up.sql b/internal/repository/postgres/schema/migrations/000001_create_initial_schema.up.sql
index 2d2da98fe..d993f57ec 100644
--- a/internal/repository/postgres/schema/migrations/000001_create_initial_schema.up.sql
+++ b/internal/repository/postgres/schema/migrations/000001_create_initial_schema.up.sql
@@ -477,6 +477,19 @@ WHERE SUBSTRING("raw_data" FROM 1 FOR 4) IN (
     E'\\x237a816f'   -- Voucher
 );
 
+-- Serves GetNumberOfPendingExecutableOutputs and pending-voucher list queries
+-- without scanning the application's full output history.
+CREATE INDEX "output_pending_voucher_idx" ON "output" ("input_epoch_application_id")
+WHERE "execution_transaction_hash" IS NULL AND SUBSTRING("raw_data" FROM 1 FOR 4) IN (
+    E'\\x10321e8b',  -- DelegateCallVoucher
+    E'\\x237a816f'   -- Voucher
+);
+
+-- Serves GetNumberOfExecutedOutputs without scanning the application's full
+-- output history. Outputs enter this index only after execution is observed.
+CREATE INDEX "output_executed_idx" ON "output" ("input_epoch_application_id")
+WHERE "execution_transaction_hash" IS NOT NULL;
+
 CREATE TRIGGER "output_set_updated_at" BEFORE UPDATE ON "output"
 FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 
diff --git a/internal/repository/repository.go b/internal/repository/repository.go
index f17d621fe..f98ec9a09 100644
--- a/internal/repository/repository.go
+++ b/internal/repository/repository.go
@@ -62,6 +62,7 @@ func ExecutableApplicationsFilter() ApplicationFilter {
 type EpochFilter struct {
 	Status      []EpochStatus
 	BeforeBlock *uint64
+	IndexRange  *Range
 }
 
 type InputFilter struct {
@@ -70,8 +71,10 @@ type InputFilter struct {
 	NotStatus       *InputCompletionStatus
 	Sender          *common.Address
 	TransactionHash *common.Hash
+	IndexRange      *Range
 }
 
+// Range defines a closed interval: both Start and End are inclusive.
 type Range struct {
 	Start uint64
 	End   uint64
@@ -81,13 +84,16 @@ type OutputFilter struct {
 	EpochIndex     *uint64
 	InputIndex     *uint64
 	BlockRange     *Range
-	OutputType     *[]byte
+	IndexRange     *Range
+	OutputType     *[][]byte
+	Executed       *bool
 	VoucherAddress *common.Address
 }
 
 type ReportFilter struct {
 	EpochIndex *uint64
 	InputIndex *uint64
+	IndexRange *Range
 }
 
 type StateHashFilter struct {
diff --git a/internal/repository/repotest/epoch_test_cases.go b/internal/repository/repotest/epoch_test_cases.go
index bc91275de..7d22efdbb 100644
--- a/internal/repository/repotest/epoch_test_cases.go
+++ b/internal/repository/repotest/epoch_test_cases.go
@@ -371,6 +371,31 @@ func (s *EpochSuite) TestListEpochs() {
 		s.Equal(uint64(5), total)
 	})
 
+	s.Run("IndexRangeComposesWithPaginationAndDescending", func() {
+		app := NewApplicationBuilder().Create(s.Ctx, s.T(), s.Repo)
+		epochInputMap := make(map[*Epoch][]*Input)
+		for i := range uint64(5) {
+			epoch := NewEpochBuilder(app.ID).
+				WithIndex(i).WithStatus(EpochStatus_Closed).
+				WithBlocks(i*10, i*10+9).WithInputBounds(i, i).Build()
+			input := NewInputBuilder().WithIndex(i).WithEpochIndex(i).WithBlockNumber(i*10 + 5).Build()
+			epochInputMap[epoch] = []*Input{input}
+		}
+		err := s.Repo.CreateEpochsAndInputs(
+			s.Ctx, app.IApplicationAddress.String(), epochInputMap, 50)
+		s.Require().NoError(err)
+
+		indexRange := repository.Range{Start: 1, End: 3}
+		epochs, total, err := s.Repo.ListEpochs(
+			s.Ctx, app.IApplicationAddress.String(),
+			repository.EpochFilter{IndexRange: &indexRange},
+			repository.Pagination{Limit: 1, Offset: 1}, true)
+		s.Require().NoError(err)
+		s.Require().Len(epochs, 1)
+		s.Equal(uint64(3), total)
+		s.Equal(uint64(2), epochs[0].Index)
+	})
+
 	s.Run("Descending", func() {
 		app := NewApplicationBuilder().Create(s.Ctx, s.T(), s.Repo)
 
diff --git a/internal/repository/repotest/input_test_cases.go b/internal/repository/repotest/input_test_cases.go
index ddd55fd0a..82254ced2 100644
--- a/internal/repository/repotest/input_test_cases.go
+++ b/internal/repository/repotest/input_test_cases.go
@@ -262,6 +262,30 @@ func (s *InputSuite) TestListInputs() {
 		s.Equal(uint64(3), total)
 	})
 
+	s.Run("IndexRangeComposesWithPaginationAndDescending", func() {
+		app := NewApplicationBuilder().Create(s.Ctx, s.T(), s.Repo)
+		epoch := NewEpochBuilder(app.ID).
+			WithIndex(0).WithStatus(EpochStatus_Closed).
+			WithBlocks(0, 49).WithInputBounds(0, 4).Build()
+		inputs := make([]*Input, 5)
+		for i := range uint64(5) {
+			inputs[i] = NewInputBuilder().WithIndex(i).WithBlockNumber(i*10 + 5).Build()
+		}
+		err := s.Repo.CreateEpochsAndInputs(
+			s.Ctx, app.IApplicationAddress.String(), map[*Epoch][]*Input{epoch: inputs}, 50)
+		s.Require().NoError(err)
+
+		indexRange := repository.Range{Start: 1, End: 3}
+		got, total, err := s.Repo.ListInputs(
+			s.Ctx, app.IApplicationAddress.String(),
+			repository.InputFilter{IndexRange: &indexRange},
+			repository.Pagination{Limit: 1, Offset: 1}, true)
+		s.Require().NoError(err)
+		s.Require().Len(got, 1)
+		s.Equal(uint64(3), total)
+		s.Equal(uint64(2), got[0].Index)
+	})
+
 	s.Run("FilterByEpochIndex", func() {
 		app := NewApplicationBuilder().Create(s.Ctx, s.T(), s.Repo)
 
diff --git a/internal/repository/repotest/output_test_cases.go b/internal/repository/repotest/output_test_cases.go
index 49eae9f38..4cf7ca506 100644
--- a/internal/repository/repotest/output_test_cases.go
+++ b/internal/repository/repotest/output_test_cases.go
@@ -62,6 +62,22 @@ func (s *OutputSuite) TestListOutputs() {
 		s.Equal(uint64(3), total)
 	})
 
+	s.Run("IndexRangeComposesWithPaginationAndDescending", func() {
+		seed := Seed(s.Ctx, s.T(), s.Repo)
+		s.storeAdvanceResult(seed.App.ID, 0, 0,
+			[][]byte{[]byte("o0"), []byte("o1"), []byte("o2"), []byte("o3"), []byte("o4")}, nil)
+
+		indexRange := repository.Range{Start: 1, End: 3}
+		outputs, total, err := s.Repo.ListOutputs(
+			s.Ctx, seed.App.IApplicationAddress.String(),
+			repository.OutputFilter{IndexRange: &indexRange},
+			repository.Pagination{Limit: 1, Offset: 1}, true)
+		s.Require().NoError(err)
+		s.Require().Len(outputs, 1)
+		s.Equal(uint64(3), total)
+		s.Equal(uint64(2), outputs[0].Index)
+	})
+
 	s.Run("FilterByEpochIndex", func() {
 		seed := Seed(s.Ctx, s.T(), s.Repo)
 
@@ -231,9 +247,10 @@ func (s *OutputSuite) TestListOutputs() {
 		s.storeAdvanceResult(seed.App.ID, 0, 0,
 			[][]byte{rawWithType, rawWithOther}, nil)
 
+		targetTypes := [][]byte{targetType}
 		outputs, total, err := s.Repo.ListOutputs(
 			s.Ctx, seed.App.IApplicationAddress.String(),
-			repository.OutputFilter{OutputType: &targetType},
+			repository.OutputFilter{OutputType: &targetTypes},
 			repository.Pagination{Limit: 10}, false)
 		s.Require().NoError(err)
 		s.Len(outputs, 1)
@@ -241,6 +258,90 @@ func (s *OutputSuite) TestListOutputs() {
 		s.Equal(rawWithType, outputs[0].RawData)
 	})
 
+	s.Run("FilterByEmptyOutputType", func() {
+		seed := Seed(s.Ctx, s.T(), s.Repo)
+
+		// OutputType filter uses SUBSTR(raw_data, 1, 4) to match the first 4 bytes
+		targetType := []byte{0xef, 0x01, 0xab, 0xcd}
+		rawWithType := make([]byte, 32)
+		copy(rawWithType[0:4], targetType)
+
+		otherType := []byte{0x00, 0x00, 0x00, 0x00}
+		rawWithOther := make([]byte, 32)
+		copy(rawWithOther[0:4], otherType)
+
+		s.storeAdvanceResult(seed.App.ID, 0, 0,
+			[][]byte{rawWithType, rawWithOther}, nil)
+
+		outputs, total, err := s.Repo.ListOutputs(
+			s.Ctx, seed.App.IApplicationAddress.String(),
+			repository.OutputFilter{OutputType: &[][]byte{}},
+			repository.Pagination{Limit: 10}, false)
+		s.Require().NoError(err)
+		s.Len(outputs, 2)
+		s.Equal(uint64(2), total)
+		s.Equal(rawWithType, outputs[0].RawData)
+		s.Equal(rawWithOther, outputs[1].RawData)
+	})
+
+	s.Run("FilterByOutputTypesAndExecutionStatus", func() {
+		seed := Seed(s.Ctx, s.T(), s.Repo)
+
+		voucherSelector := []byte{0x23, 0x7a, 0x81, 0x6f}
+		delegateCallVoucherSelector := []byte{0x10, 0x32, 0x1e, 0x8b}
+		voucher := append([]byte{}, voucherSelector...)
+		delegateCallVoucher := append([]byte{}, delegateCallVoucherSelector...)
+		notice := []byte{0xc2, 0x58, 0xd6, 0xe5}
+		executedVoucher := append([]byte{}, voucherSelector...)
+		s.storeAdvanceResult(seed.App.ID, 0, 0,
+			[][]byte{voucher, delegateCallVoucher, notice, executedVoucher}, nil)
+
+		txHash := UniqueHash()
+		err := s.Repo.UpdateOutputsExecution(
+			s.Ctx,
+			seed.App.IApplicationAddress.String(),
+			[]*Output{{
+				InputEpochApplicationID:  seed.App.ID,
+				Index:                    3,
+				ExecutionTransactionHash: &txHash,
+			}},
+			200,
+		)
+		s.Require().NoError(err)
+
+		outputTypes := [][]byte{voucherSelector, delegateCallVoucherSelector}
+		executed := false
+		outputs, total, err := s.Repo.ListOutputs(
+			s.Ctx, seed.App.IApplicationAddress.String(),
+			repository.OutputFilter{OutputType: &outputTypes, Executed: &executed},
+			repository.Pagination{Limit: 10}, false)
+		s.Require().NoError(err)
+		s.Require().Len(outputs, 2)
+		s.Equal(uint64(2), total)
+		s.Equal(uint64(0), outputs[0].Index)
+		s.Equal(uint64(1), outputs[1].Index)
+
+		executed = true
+		outputs, total, err = s.Repo.ListOutputs(
+			s.Ctx, seed.App.IApplicationAddress.String(),
+			repository.OutputFilter{OutputType: &outputTypes, Executed: &executed},
+			repository.Pagination{Limit: 10}, false)
+		s.Require().NoError(err)
+		s.Require().Len(outputs, 1)
+		s.Equal(uint64(1), total)
+		s.Equal(uint64(3), outputs[0].Index)
+
+		// The validator uses the nil-filter path to reproduce epoch claims;
+		// it must continue to include every output type and execution state.
+		outputs, total, err = s.Repo.ListOutputs(
+			s.Ctx, seed.App.IApplicationAddress.String(),
+			repository.OutputFilter{},
+			repository.Pagination{}, false)
+		s.Require().NoError(err)
+		s.Len(outputs, 4)
+		s.Equal(uint64(4), total)
+	})
+
 	s.Run("FilterByVoucherAddress", func() {
 		seed := Seed(s.Ctx, s.T(), s.Repo)
 
diff --git a/internal/repository/repotest/report_test_cases.go b/internal/repository/repotest/report_test_cases.go
index 8d5c74571..2791bef91 100644
--- a/internal/repository/repotest/report_test_cases.go
+++ b/internal/repository/repotest/report_test_cases.go
@@ -62,6 +62,22 @@ func (s *ReportSuite) TestListReports() {
 		s.Equal(uint64(3), total)
 	})
 
+	s.Run("IndexRangeComposesWithPaginationAndDescending", func() {
+		seed := Seed(s.Ctx, s.T(), s.Repo)
+		s.storeAdvanceResult(seed.App.ID, 0, 0, nil,
+			[][]byte{[]byte("r0"), []byte("r1"), []byte("r2"), []byte("r3"), []byte("r4")})
+
+		indexRange := repository.Range{Start: 1, End: 3}
+		reports, total, err := s.Repo.ListReports(
+			s.Ctx, seed.App.IApplicationAddress.String(),
+			repository.ReportFilter{IndexRange: &indexRange},
+			repository.Pagination{Limit: 1, Offset: 1}, true)
+		s.Require().NoError(err)
+		s.Require().Len(reports, 1)
+		s.Equal(uint64(3), total)
+		s.Equal(uint64(2), reports[0].Index)
+	})
+
 	s.Run("FilterByEpochIndex", func() {
 		seed := Seed(s.Ctx, s.T(), s.Repo)
 
diff --git a/test/tooling/db/db.go b/test/tooling/db/db.go
index 747f0234f..a5f626ebb 100644
--- a/test/tooling/db/db.go
+++ b/test/tooling/db/db.go
@@ -4,12 +4,16 @@
 package db
 
 import (
+	"context"
 	"fmt"
 	"os"
 
 	"github.com/cartesi/rollups-node/internal/repository/postgres/schema"
+	"github.com/jackc/pgx/v5"
 )
 
+const testDatabaseLockID int64 = 0x4352545349544553 // "CRTSITES"
+
 func GetTestDatabaseEndpoint() (string, error) {
 	endpoint, ok := os.LookupEnv("CARTESI_TEST_DATABASE_CONNECTION")
 	if !ok {
@@ -18,6 +22,21 @@ func GetTestDatabaseEndpoint() (string, error) {
 	return endpoint, nil
 }
 
+// LockTestPostgres serializes package test processes that reset the shared test
+// schema. The session-level advisory lock is held until the returned connection
+// closer is called.
+func LockTestPostgres(ctx context.Context, endpoint string) (func(), error) {
+	conn, err := pgx.Connect(ctx, endpoint)
+	if err != nil {
+		return nil, fmt.Errorf("failed to connect for test database lock: %w", err)
+	}
+	if _, err := conn.Exec(ctx, "SELECT pg_advisory_lock($1)", testDatabaseLockID); err != nil {
+		_ = conn.Close(context.Background())
+		return nil, fmt.Errorf("failed to lock test database: %w", err)
+	}
+	return func() { _ = conn.Close(context.Background()) }, nil
+}
+
 func SetupTestPostgres(endpoint string) error {
 
 	schema, err := schema.New(endpoint)
diff --git a/test/validator/validator_test.go b/test/validator/validator_test.go
index 08ecee778..6fa78fc50 100644
--- a/test/validator/validator_test.go
+++ b/test/validator/validator_test.go
@@ -5,8 +5,10 @@ package validator
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
 	"math/big"
+	"os"
 	"testing"
 	"time"
 
@@ -29,6 +31,21 @@ const MAX_OUTPUT_TREE_HEIGHT = merkle.TREE_DEPTH //nolint: revive
 
 const testTimeout = 300 * time.Second
 
+func TestMain(m *testing.M) {
+	endpoint, err := db.GetTestDatabaseEndpoint()
+	if err != nil {
+		os.Exit(m.Run())
+	}
+	release, err := db.LockTestPostgres(context.Background(), endpoint)
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+	code := m.Run()
+	release()
+	os.Exit(code)
+}
+
 type ValidatorRepositoryIntegrationSuite struct {
 	suite.Suite
 	ctx              context.Context