add option to disable format_batch for batch responses (#131)

* add option to disable format_batch for batch responses

* improve

* fix

* bump version

.tool-versions

@@ -1,2 +1,2 @@
-elixir 1.13.1-otp-24
-erlang 24.1.4
+elixir 1.13.4-otp-24
+erlang 24.1.7

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.10.1 - 2022-07-29
+* Add option to not format batch requests (https://github.com/mana-ethereum/ethereumex/pull/131)
+
 ## 0.10.0 - 2022-05-10
 * Add EIP1559 support for eth_maxPriorityFeePerGas and eth_feeHistory (https://github.com/mana-ethereum/ethereumex/pull/127)
 * Update finch to 0.12.0 (https://github.com/mana-ethereum/ethereumex/pull/126)

README.md

@@ -20,7 +20,7 @@ Add `:ethereumex` to your list of dependencies in `mix.exs`:
 ```elixir
 def deps do
   [
-    {:ethereumex, "~> 0.9"}
+    {:ethereumex, "~> 0.10"}
   ]
 end
 ```

lib/ethereumex/config.ex

@@ -64,6 +64,11 @@ defmodule Ethereumex.Config do
     Application.get_env(:ethereumex, :client_type, :http)
   end
 
+  @spec format_batch() :: boolean()
+  def format_batch() do
+    Application.get_env(:ethereumex, :format_batch, true)
+  end
+
   @spec poolboy_config() :: keyword()
   defp poolboy_config() do
     [

lib/ethereumex/http_client.ex

@@ -2,6 +2,7 @@ defmodule Ethereumex.HttpClient do
   @moduledoc false
 
   use Ethereumex.Client.BaseClient
+
   alias Ethereumex.Config
 
   @type opt :: {:url, String.t()}
@@ -13,26 +14,40 @@ defmodule Ethereumex.HttpClient do
   def post_request(payload, opts) do
     headers = Keyword.get(opts, :http_headers) || Config.http_headers()
     url = Keyword.get(opts, :url) || Config.rpc_url()
+
+    format_batch =
+      case Keyword.get(opts, :format_batch) do
+        nil -> Config.format_batch()
+        value -> value
+      end
+
     request = Finch.build(:post, url, headers, payload)
 
     case Finch.request(request, Ethereumex.Finch, Config.http_options()) do
       {:ok, %Finch.Response{body: body, status: code}} ->
-        decode_body(body, code)
+        decode_body(body, code, format_batch)
 
       {:error, error} ->
         {:error, error}
     end
   end
 
-  @spec decode_body(binary(), non_neg_integer()) :: {:ok, any()} | http_client_error()
-  defp decode_body(body, code) do
+  @spec decode_body(binary(), non_neg_integer(), boolean()) :: {:ok, any()} | http_client_error()
+  defp decode_body(body, code, format_batch) do
     case Jason.decode(body) do
       {:ok, decoded_body} ->
         case {code, decoded_body} do
-          {200, %{"error" => error}} -> {:error, error}
-          {200, result = [%{} | _]} -> {:ok, format_batch(result)}
-          {200, %{"result" => result}} -> {:ok, result}
-          _ -> {:error, decoded_body}
+          {200, %{"error" => error}} ->
+            {:error, error}
+
+          {200, result = [%{} | _]} ->
+            {:ok, maybe_format_batch(result, format_batch)}
+
+          {200, %{"result" => result}} ->
+            {:ok, result}
+
+          _ ->
+            {:error, decoded_body}
         end
 
       {:error, %Jason.DecodeError{data: ""}} ->
@@ -42,4 +57,8 @@ defmodule Ethereumex.HttpClient do
         {:error, {:invalid_json, error}}
     end
   end
+
+  defp maybe_format_batch(responses, true), do: format_batch(responses)
+
+  defp maybe_format_batch(responses, _), do: responses
 end

mix.exs

@@ -2,7 +2,7 @@ defmodule Ethereumex.Mixfile do
   use Mix.Project
 
   @source_url "https://github.com/exthereum/ethereumex"
-  @version "0.10.0"
+  @version "0.10.1"
 
   def project do
     [