Revert "Handle empty id in json rpc responses (#28)"

This reverts commit 958b4d3.

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex

@@ -25,8 +25,6 @@ defmodule EthereumJSONRPC do
   documentation for `EthereumJSONRPC.RequestCoordinator`.
   """
 
-  require Logger
-
   alias EthereumJSONRPC.{
     Block,
     Blocks,
@@ -363,29 +361,6 @@ defmodule EthereumJSONRPC do
     |> Enum.into(%{}, fn {params, id} -> {id, params} end)
   end
 
-  @doc """
-  Assigns not matched ids between requests and responses to responses with incorrect ids
-  """
-  def sanitize_responses(responses, id_to_params) do
-    responses
-    |> Enum.reduce(
-      {[], Map.keys(id_to_params) -- Enum.map(responses, & &1.id)},
-      fn
-        %{id: nil} = res, {result_res, [id | rest]} ->
-          Logger.error(
-            "Empty id in response: #{inspect(res)}, stacktrace: #{inspect(Process.info(self(), :current_stacktrace))}"
-          )
-
-          {[%{res | id: id} | result_res], rest}
-
-        res, {result_res, non_matched} ->
-          {[res | result_res], non_matched}
-      end
-    )
-    |> elem(0)
-    |> Enum.reverse()
-  end
-
   @doc """
     1. POSTs JSON `payload` to `url`
     2. Decodes the response
@@ -411,7 +386,7 @@ defmodule EthereumJSONRPC do
   @doc """
   Converts `t:quantity/0` to `t:non_neg_integer/0`.
   """
-  @spec quantity_to_integer(quantity) :: non_neg_integer() | nil
+  @spec quantity_to_integer(quantity) :: non_neg_integer() | :error
   def quantity_to_integer("0x" <> hexadecimal_digits) do
     String.to_integer(hexadecimal_digits, 16)
   end
@@ -421,12 +396,10 @@ defmodule EthereumJSONRPC do
   def quantity_to_integer(string) when is_binary(string) do
     case Integer.parse(string) do
       {integer, ""} -> integer
-      _ -> nil
+      _ -> :error
     end
   end
 
-  def quantity_to_integer(_), do: nil
-
   @doc """
   Converts `t:non_neg_integer/0` to `t:quantity/0`
   """
@@ -495,7 +468,7 @@ defmodule EthereumJSONRPC do
   """
   def timestamp_to_datetime(timestamp) do
     case quantity_to_integer(timestamp) do
-      nil ->
+      :error ->
         nil
 
       quantity ->

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex

@@ -66,7 +66,6 @@ defmodule EthereumJSONRPC.Besu.FetchedBeneficiaries do
   """
   def from_responses(responses, id_to_params) when is_list(responses) and is_map(id_to_params) do
     responses
-    |> EthereumJSONRPC.sanitize_responses(id_to_params)
     |> Enum.map(&response_to_params_set(&1, id_to_params))
     |> Enum.reduce(
       %EthereumJSONRPC.FetchedBeneficiaries{},

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex

@@ -32,7 +32,6 @@ defmodule EthereumJSONRPC.Blocks do
   def from_responses(responses, id_to_params) when is_list(responses) and is_map(id_to_params) do
     %{errors: errors, blocks: blocks} =
       responses
-      |> EthereumJSONRPC.sanitize_responses(id_to_params)
       |> Enum.map(&Block.from_response(&1, id_to_params))
       |> Enum.reduce(%{errors: [], blocks: []}, fn
         {:ok, block}, %{blocks: blocks} = acc ->

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/fetched_balances.ex

@@ -19,7 +19,6 @@ defmodule EthereumJSONRPC.FetchedBalances do
   """
   def from_responses(responses, id_to_params) do
     responses
-    |> EthereumJSONRPC.sanitize_responses(id_to_params)
     |> Enum.map(&FetchedBalance.from_response(&1, id_to_params))
     |> Enum.reduce(
       %__MODULE__{},

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/fetched_codes.ex

@@ -34,7 +34,6 @@ defmodule EthereumJSONRPC.FetchedCodes do
   """
   def from_responses(responses, id_to_params) do
     responses
-    |> EthereumJSONRPC.sanitize_responses(id_to_params)
     |> Enum.map(&FetchedCode.from_response(&1, id_to_params))
     |> Enum.reduce(
       %__MODULE__{},

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex

@@ -132,7 +132,6 @@ defmodule EthereumJSONRPC.Geth do
        )
        when is_list(responses) and is_map(id_to_params) do
     responses
-    |> EthereumJSONRPC.sanitize_responses(id_to_params)
     |> Enum.map(&debug_trace_transaction_response_to_internal_transactions_params(&1, id_to_params))
     |> reduce_internal_transactions_params()
   end

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex

@@ -138,18 +138,15 @@ defmodule EthereumJSONRPC.HTTP do
 
     standardized = %{jsonrpc: jsonrpc, id: id}
 
-    case {id, unstandardized} do
-      {_id, %{"result" => _, "error" => _}} ->
+    case unstandardized do
+      %{"result" => _, "error" => _} ->
         raise ArgumentError,
               "result and error keys are mutually exclusive in JSONRPC 2.0 response objects, but got #{inspect(unstandardized)}"
 
-      {nil, %{"result" => error}} ->
-        Map.put(standardized, :error, standardize_error(error))
-
-      {_id, %{"result" => result}} ->
+      %{"result" => result} ->
         Map.put(standardized, :result, result)
 
-      {_id, %{"error" => error}} ->
+      %{"error" => error} ->
         Map.put(standardized, :error, standardize_error(error))
     end
   end

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex

@@ -66,7 +66,6 @@ defmodule EthereumJSONRPC.Parity.FetchedBeneficiaries do
   """
   def from_responses(responses, id_to_params) when is_list(responses) and is_map(id_to_params) do
     responses
-    |> EthereumJSONRPC.sanitize_responses(id_to_params)
     |> Enum.map(&response_to_params_set(&1, id_to_params))
     |> Enum.reduce(
       %EthereumJSONRPC.FetchedBeneficiaries{},

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex

@@ -240,7 +240,6 @@ defmodule EthereumJSONRPC.Receipts do
   defp reduce_responses(responses, id_to_transaction_params)
        when is_list(responses) and is_map(id_to_transaction_params) do
     responses
-    |> EthereumJSONRPC.sanitize_responses(id_to_transaction_params)
     |> Stream.map(&response_to_receipt(&1, id_to_transaction_params))
     |> Enum.reduce({:ok, []}, &reduce_receipt(&1, &2))
   end

docker/Dockerfile.zksync

@@ -23,7 +23,7 @@ ADD . .
 RUN apt-get update -y && apt-get install -y curl build-essential git && \
     # Get Rust \
     apt-get update -y && apt-get install -y curl && \
-    curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
     . $HOME/.cargo/env && \
     curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
     apt-get install -y nodejs && \