merge

apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/contract_controller.ex

@@ -72,10 +72,18 @@ defmodule BlockScoutWeb.API.RPC.ContractController do
     with {:address_param, {:ok, address_param}} <- fetch_address(params),
          {:format, {:ok, address_hash}} <- to_address_hash(address_param) do
       address =
+<<<<<<< HEAD
         with {:ok, proxy_contract} <- Chain.get_proxied_address(address_hash) do
           Logger.debug("Implementation address FOUND in proxy table")
           Chain.address_hash_to_address_with_source_code(proxy_contract)
         else
+=======
+        case Chain.get_proxied_address(address_hash) do
+          {:ok, proxy_contract} ->
+            Logger.debug("Implementation address FOUND in proxy table")
+            Chain.address_hash_to_address_with_source_code(proxy_contract)
+
+>>>>>>> 1a92f710716f2d5e8138e90f2d7e88cc26faeaec
           {:error, :not_found} ->
             Logger.debug("Implementation address NOT found in proxy table")
             Chain.address_hash_to_address_with_source_code(address_hash)

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/contract.ex

@@ -36,13 +36,18 @@ defmodule EthereumJSONRPC.Contract do
 
     requests_with_index = Enum.with_index(requests)
 
+<<<<<<< HEAD
     prepared =
+=======
+    indexed_responses =
+>>>>>>> 1a92f710716f2d5e8138e90f2d7e88cc26faeaec
       requests_with_index
       |> Enum.map(fn {%{contract_address: contract_address, function_name: function_name, args: args} = request, index} ->
         functions[function_name]
         |> Encoder.encode_function_call(args)
         |> eth_call_request(contract_address, index, Map.get(request, :block_number))
       end)
+<<<<<<< HEAD
 
     indexed_responses =
       prepared
@@ -59,6 +64,14 @@ defmodule EthereumJSONRPC.Contract do
 
         {:error, error} ->
           raise error
+=======
+      |> json_rpc(json_rpc_named_arguments)
+      |> case do
+        {:ok, responses} -> responses
+        {:error, {:bad_gateway, _request_url}} -> raise "Bad gateway"
+        {:error, reason} when is_atom(reason) -> raise Atom.to_string(reason)
+        {:error, error} -> raise error
+>>>>>>> 1a92f710716f2d5e8138e90f2d7e88cc26faeaec
       end
       |> Enum.into(%{}, &{&1.id, &1})
 

apps/explorer/lib/explorer/chain/import/runner/celo_validator_groups.ex

@@ -32,13 +32,8 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorGroups do
   end
 
   @impl Import.Runner
-  def run(multi, changes_list, %{timestamps: timestamps} = options) do
-    insert_options =
-      options
-      |> Map.get(option_key(), %{})
-      |> Map.take(~w(on_conflict timeout)a)
-      |> Map.put_new(:timeout, @timeout)
-      |> Map.put(:timestamps, timestamps)
+  def run(multi, changes_list, options) do
+    insert_options = Util.make_insert_options(option_key(), @timeout, options)
 
     # Enforce ShareLocks tables order (see docs: sharelocks.md)
     multi
@@ -67,19 +62,15 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorGroups do
     {:ok, accounts}
   end
 
-  @spec insert(Repo.t(), [map()], %{
-          optional(:on_conflict) => Import.Runner.on_conflict(),
-          required(:timeout) => timeout,
-          required(:timestamps) => Import.timestamps()
-        }) ::
-          {:ok, [CeloValidatorGroup.t()]}
-          | {:error, [Changeset.t()]}
+  @spec insert(Repo.t(), [map()], Util.insert_option()) :: {:ok, [CeloValidatorGroup.t()]} | {:error, [Changeset.t()]}
   defp insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = options) when is_list(changes_list) do
     on_conflict = Map.get_lazy(options, :on_conflict, &default_on_conflict/0)
 
     # Enforce ShareLocks order (see docs: sharelocks.md)
-    ordered_changes_list = Enum.sort_by(changes_list, & &1.address)
-    uniq_changes_list = Enum.dedup_by(ordered_changes_list, & &1.address)
+    uniq_changes_list =
+      changes_list
+      |> Enum.sort_by(& &1.address)
+      |> Enum.dedup_by(& &1.address)
 
     {:ok, _} =
       Import.insert_changes_list(

apps/explorer/lib/explorer/chain/import/runner/celo_validator_history.ex

@@ -7,6 +7,7 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorHistory do
 
   alias Ecto.{Changeset, Multi, Repo}
   alias Explorer.Chain.{Import, CeloValidatorHistory}
+  alias Explorer.Chain.Import.Runner.Util
 
   import Ecto.Query, only: [from: 2]
 
@@ -32,13 +33,8 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorHistory do
   end
 
   @impl Import.Runner
-  def run(multi, changes_list, %{timestamps: timestamps} = options) do
-    insert_options =
-      options
-      |> Map.get(option_key(), %{})
-      |> Map.take(~w(on_conflict timeout)a)
-      |> Map.put_new(:timeout, @timeout)
-      |> Map.put(:timestamps, timestamps)
+  def run(multi, changes_list, options) do
+    insert_options = Util.make_insert_options(option_key(), @timeout, options)
 
     # Enforce ShareLocks tables order (see docs: sharelocks.md)
     Multi.run(multi, :insert_items, fn repo, _ ->
@@ -49,19 +45,16 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorHistory do
   @impl Import.Runner
   def timeout, do: @timeout
 
-  @spec insert(Repo.t(), [map()], %{
-          optional(:on_conflict) => Import.Runner.on_conflict(),
-          required(:timeout) => timeout,
-          required(:timestamps) => Import.timestamps()
-        }) ::
-          {:ok, [CeloValidatorHistory.t()]}
-          | {:error, [Changeset.t()]}
+  @spec insert(Repo.t(), [map()], Util.insert_options()) ::
+          {:ok, [CeloValidatorHistory.t()]} | {:error, [Changeset.t()]}
   defp insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = options) when is_list(changes_list) do
     on_conflict = Map.get_lazy(options, :on_conflict, &default_on_conflict/0)
 
     # Enforce ShareLocks order (see docs: sharelocks.md)
-    ordered_changes_list = Enum.sort_by(changes_list, &{&1.block_number, &1.index})
-    uniq_changes_list = Enum.dedup_by(ordered_changes_list, &{&1.block_number, &1.index})
+    uniq_changes_list =
+      changes_list
+      |> Enum.sort_by(&{&1.block_number, &1.index})
+      |> Enum.dedup_by(&{&1.block_number, &1.index})
 
     {:ok, _} =
       Import.insert_changes_list(

apps/explorer/lib/explorer/chain/import/runner/celo_withdrawals.ex

@@ -7,6 +7,7 @@ defmodule Explorer.Chain.Import.Runner.CeloWithdrawals do
 
   alias Ecto.{Changeset, Multi, Repo}
   alias Explorer.Chain.{Import, CeloWithdrawal}
+  alias Explorer.Chain.Import.Runner.Util
 
   import Ecto.Query, only: [from: 2]
 
@@ -32,13 +33,8 @@ defmodule Explorer.Chain.Import.Runner.CeloWithdrawals do
   end
 
   @impl Import.Runner
-  def run(multi, changes_list, %{timestamps: timestamps} = options) do
-    insert_options =
-      options
-      |> Map.get(option_key(), %{})
-      |> Map.take(~w(on_conflict timeout)a)
-      |> Map.put_new(:timeout, @timeout)
-      |> Map.put(:timestamps, timestamps)
+  def run(multi, changes_list, options) do
+    insert_options = Util.make_insert_options(option_key(), @timeout, options)
 
     # Enforce ShareLocks tables order (see docs: sharelocks.md)
     Multi.run(multi, :insert_items, fn repo, _ ->
@@ -49,19 +45,15 @@ defmodule Explorer.Chain.Import.Runner.CeloWithdrawals do
   @impl Import.Runner
   def timeout, do: @timeout
 
-  @spec insert(Repo.t(), [map()], %{
-          optional(:on_conflict) => Import.Runner.on_conflict(),
-          required(:timeout) => timeout,
-          required(:timestamps) => Import.timestamps()
-        }) ::
-          {:ok, [CeloWithdrawal.t()]}
-          | {:error, [Changeset.t()]}
+  @spec insert(Repo.t(), [map()], Util.insert_options()) :: {:ok, [CeloWithdrawal.t()]} | {:error, [Changeset.t()]}
   defp insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = options) when is_list(changes_list) do
     on_conflict = Map.get_lazy(options, :on_conflict, &default_on_conflict/0)
 
     # Enforce ShareLocks order (see docs: sharelocks.md)
-    ordered_changes_list = Enum.sort_by(changes_list, &{&1.address, &1.index})
-    uniq_changes_list = Enum.dedup_by(ordered_changes_list, &{&1.address, &1.index})
+    uniq_changes_list =
+      changes_list
+      |> Enum.sort_by(&{&1.address, &1.index})
+      |> Enum.dedup_by(&{&1.address, &1.index})
 
     {:ok, _} =
       Import.insert_changes_list(

apps/indexer/lib/indexer/fetcher/celo_account.ex

@@ -13,6 +13,7 @@ defmodule Indexer.Fetcher.CeloAccount do
 
   @behaviour BufferedTask
 
+<<<<<<< HEAD
   @defaults [
     flush_interval: 300,
     max_batch_size: 100,
@@ -30,6 +31,18 @@ defmodule Indexer.Fetcher.CeloAccount do
         accounts.params
         |> Enum.map(&entry/1)
 
+=======
+  @max_retries 3
+
+  def async_fetch(accounts) do
+    if CeloAccountSupervisor.disabled?() do
+      :ok
+    else
+      params =
+        accounts.params
+        |> Enum.map(&entry/1)
+
+>>>>>>> 1a92f710716f2d5e8138e90f2d7e88cc26faeaec
       BufferedTask.buffer(__MODULE__, params, :infinity)
     end
   end
@@ -43,12 +56,16 @@ defmodule Indexer.Fetcher.CeloAccount do
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
+<<<<<<< HEAD
     merged_init_opts =
       @defaults
       |> Keyword.merge(init_options)
       |> Keyword.put(:state, {0, []})
 
     Supervisor.child_spec({BufferedTask, [{__MODULE__, merged_init_opts}, gen_server_options]}, id: __MODULE__)
+=======
+    Indexer.Fetcher.Util.default_child_spec(init_options, gen_server_options, __MODULE__)
+>>>>>>> 1a92f710716f2d5e8138e90f2d7e88cc26faeaec
   end
 
   @impl BufferedTask

apps/indexer/lib/indexer/fetcher/celo_validator.ex

@@ -8,18 +8,12 @@ defmodule Indexer.Fetcher.CeloValidator do
   alias Explorer.Chain.CeloValidator
   alias Explorer.Chain
   alias Explorer.Celo.AccountReader
+  alias Indexer.Fetcher.Util
 
   alias Indexer.BufferedTask
 
   @behaviour BufferedTask
 
-  @defaults [
-    flush_interval: 300,
-    max_batch_size: 100,
-    max_concurrency: 10,
-    task_supervisor: Indexer.Fetcher.CeloValidator.TaskSupervisor
-  ]
-
   @max_retries 3
 
   def async_fetch(accounts) do
@@ -43,12 +37,7 @@ defmodule Indexer.Fetcher.CeloValidator do
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
-    merged_init_opts =
-      @defaults
-      |> Keyword.merge(init_options)
-      |> Keyword.put(:state, {0, []})
-
-    Supervisor.child_spec({BufferedTask, [{__MODULE__, merged_init_opts}, gen_server_options]}, id: __MODULE__)
+    Util.default_child_spec(init_options, gen_server_options, __MODULE__)
   end
 
   @impl BufferedTask

apps/indexer/lib/indexer/fetcher/celo_validator_group.ex

@@ -13,6 +13,7 @@ defmodule Indexer.Fetcher.CeloValidatorGroup do
 
   @behaviour BufferedTask
 
+<<<<<<< HEAD
   @defaults [
     flush_interval: 300,
     max_batch_size: 100,
@@ -30,6 +31,18 @@ defmodule Indexer.Fetcher.CeloValidatorGroup do
         accounts.params
         |> Enum.map(&entry/1)
 
+=======
+  @max_retries 3
+
+  def async_fetch(accounts) do
+    if CeloValidatorGroupSupervisor.disabled?() do
+      :ok
+    else
+      params =
+        accounts.params
+        |> Enum.map(&entry/1)
+
+>>>>>>> 1a92f710716f2d5e8138e90f2d7e88cc26faeaec
       BufferedTask.buffer(__MODULE__, params, :infinity)
     end
   end
@@ -43,12 +56,16 @@ defmodule Indexer.Fetcher.CeloValidatorGroup do
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
+<<<<<<< HEAD
     merged_init_opts =
       @defaults
       |> Keyword.merge(init_options)
       |> Keyword.put(:state, {0, []})
 
     Supervisor.child_spec({BufferedTask, [{__MODULE__, merged_init_opts}, gen_server_options]}, id: __MODULE__)
+=======
+    Indexer.Fetcher.Util.default_child_spec(init_options, gen_server_options, __MODULE__)
+>>>>>>> 1a92f710716f2d5e8138e90f2d7e88cc26faeaec
   end
 
   @impl BufferedTask

apps/indexer/lib/indexer/fetcher/celo_validator_history.ex

@@ -13,20 +13,14 @@ defmodule Indexer.Fetcher.CeloValidatorHistory do
 
   @behaviour BufferedTask
 
-  @defaults [
-    flush_interval: 300,
-    max_batch_size: 100,
-    max_concurrency: 10,
-    task_supervisor: Indexer.Fetcher.CeloValidatorHistory.TaskSupervisor
-  ]
-
   @max_retries 3
 
   def async_fetch(range) do
     if CeloValidatorHistorySupervisor.disabled?() do
       :ok
     else
       params = Enum.map(range, &entry/1)
+
       BufferedTask.buffer(__MODULE__, params, :infinity)
     end
   end
@@ -40,12 +34,7 @@ defmodule Indexer.Fetcher.CeloValidatorHistory do
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
-    merged_init_opts =
-      @defaults
-      |> Keyword.merge(init_options)
-      |> Keyword.put(:state, {0, []})
-
-    Supervisor.child_spec({BufferedTask, [{__MODULE__, merged_init_opts}, gen_server_options]}, id: __MODULE__)
+    Indexer.Fetcher.Util.default_child_spec(init_options, gen_server_options, __MODULE__)
   end
 
   @impl BufferedTask
@@ -124,7 +113,6 @@ defmodule Indexer.Fetcher.CeloValidatorHistory do
           error_count: Enum.count(blocks)
         )
     end
-  end
 
     failed
   end

apps/indexer/lib/indexer/fetcher/celo_withdrawal.ex

@@ -13,13 +13,6 @@ defmodule Indexer.Fetcher.CeloWithdrawal do
 
   @behaviour BufferedTask
 
-  @defaults [
-    flush_interval: 300,
-    max_batch_size: 100,
-    max_concurrency: 10,
-    task_supervisor: Indexer.Fetcher.CeloWithdrawal.TaskSupervisor
-  ]
-
   @max_retries 3
 
   def async_fetch(accounts) do
@@ -43,12 +36,7 @@ defmodule Indexer.Fetcher.CeloWithdrawal do
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
-    merged_init_opts =
-      @defaults
-      |> Keyword.merge(init_options)
-      |> Keyword.put(:state, {0, []})
-
-    Supervisor.child_spec({BufferedTask, [{__MODULE__, merged_init_opts}, gen_server_options]}, id: __MODULE__)
+    Indexer.Fetcher.Util.default_child_spec(init_options, gen_server_options, __MODULE__)
   end
 
   @impl BufferedTask